fix libetpan 0.48 windows build.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3764 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/libetpan/build-windows/build_headers.list b/libs/libetpan/build-windows/build_headers.list
index 7df6e6fb6ff9dd2c72a61e7100fd9b553544062e..8de39bd180957a8a64235b4cbb234e26b9063516 100644 (file)
--- a/libs/libetpan/build-windows/build_headers.list
+++ b/libs/libetpan/build-windows/build_headers.list
@@ -116,6 +116,8 @@ libetpan_version.h
 ..\src\low-level\imap\acl_parser.h
 ..\src\low-level\imap\acl_types.h
 ..\src\low-level\imap\acl_sender.h
+..\src\low-level\imap\uidplus.h
+..\src\low-level\imap\uidplus_types.h
 ..\src\low-level\imf\mailimf.h
 ..\src\low-level\imf\mailimf_types.h
 ..\src\low-level\imf\mailimf_types_helper.h

diff --git a/libs/libetpan/src/low-level/imap/uidplus_types.h b/libs/libetpan/src/low-level/imap/uidplus_types.h
index c1e0852c3e3dffe4f8b0191bc47e0425ae1de4ff..c879e60ab05f8935856116c52c2a312385390a8a 100644 (file)
--- a/libs/libetpan/src/low-level/imap/uidplus_types.h
+++ b/libs/libetpan/src/low-level/imap/uidplus_types.h
@@ -6,7 +6,10 @@
 extern "C" {
 #endif
 
+#ifndef _MSC_VER
 #include <inttypes.h>
+#endif
+
 #include "mailimap_types.h"
 
 enum {

diff --git a/libs/win32/etpan/libetpan.vcproj b/libs/win32/etpan/libetpan.vcproj
index 5edea84db09cccc45578457b22ffe514029e4e0c..65197c2213ff98c4e9fa95580507542e7e1e4f0e 100644 (file)
--- a/libs/win32/etpan/libetpan.vcproj
+++ b/libs/win32/etpan/libetpan.vcproj
@@ -42,7 +42,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                InlineFunctionExpansion="0"\r
-                               AdditionalIncludeDirectories="../../libetpan-0.46/build-windows/include;../../libetpan-0.46/build-windows/include/libetpan"\r
+                               AdditionalIncludeDirectories="../../libetpan/build-windows/include;../../libetpan/build-windows/include/libetpan"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBETPAN_DLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -52,7 +52,7 @@
                                Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="4"\r
                                CompileAs="1"\r
-                               ForcedIncludeFiles="$(ProjectDir)../../libetpan-0.46/build-windows/StdAfx.h"\r
+                               ForcedIncludeFiles="$(ProjectDir)../../libetpan/build-windows/StdAfx.h"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -129,7 +129,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../../libetpan-0.46/build-windows/include;../../libetpan-0.46/build-windows/include/libetpan"\r
+                               AdditionalIncludeDirectories="../../libetpan/build-windows/include;../../libetpan/build-windows/include/libetpan"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBETPAN_DLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -137,7 +137,7 @@
                                Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="0"\r
                                CompileAs="1"\r
-                               ForcedIncludeFiles="$(ProjectDir)../../libetpan-0.46/build-windows/StdAfx.h"\r
+                               ForcedIncludeFiles="$(ProjectDir)../../libetpan/build-windows/StdAfx.h"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -197,14 +197,14 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath="..\build_headers.list"\r
+                               RelativePath="..\..\libetpan\build-windows\build_headers.list"\r
                                >\r
                                <FileConfiguration\r
                                        Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               CommandLine="cd ..\..\libetpan-0.46\build-windows&#x0D;&#x0A;build_headers.bat&#x0D;&#x0A;"\r
+                                               CommandLine="cd ..\..\libetpan\build-windows&#x0D;&#x0A;build_headers.bat&#x0D;&#x0A;"\r
                                                Outputs="$(InputDir)\_headers_depends"\r
                                        />\r
                                </FileConfiguration>\r
@@ -213,7 +213,7 @@
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               CommandLine="cd ..\..\libetpan-0.46\build-windows&#x0D;&#x0A;build_headers.bat&#x0D;&#x0A;"\r
+                                               CommandLine="cd ..\..\libetpan\build-windows&#x0D;&#x0A;build_headers.bat&#x0D;&#x0A;"\r
                                                Outputs="$(InputDir)\_headers_depends"\r
                                        />\r
                                </FileConfiguration>\r
@@ -222,7 +222,7 @@
                                Name="engine"\r
                                >\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\engine\mailengine.c"\r
+                                       RelativePath="..\..\libetpan\src\engine\mailengine.c"\r
                                        >\r
                                        <FileConfiguration\r
                                                Name="Debug|Win32"\r
@@ -242,7 +242,7 @@
                                        </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\engine\mailprivacy.c"\r
+                                       RelativePath="..\..\libetpan\src\engine\mailprivacy.c"\r
                                        >\r
                                        <FileConfiguration\r
                                                Name="Debug|Win32"\r
@@ -262,7 +262,7 @@
                                        </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\engine\mailprivacy_gnupg.c"\r
+                                       RelativePath="..\..\libetpan\src\engine\mailprivacy_gnupg.c"\r
                                        >\r
                                        <FileConfiguration\r
                                                Name="Debug|Win32"\r
@@ -282,7 +282,7 @@
                                        </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\engine\mailprivacy_smime.c"\r
+                                       RelativePath="..\..\libetpan\src\engine\mailprivacy_smime.c"\r
                                        >\r
                                        <FileConfiguration\r
                                                Name="Debug|Win32"\r
@@ -302,7 +302,7 @@
                                        </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\engine\mailprivacy_tools.c"\r
+                                       RelativePath="..\..\libetpan\src\engine\mailprivacy_tools.c"\r
                                        >\r
                                        <FileConfiguration\r
                                                Name="Debug|Win32"\r
@@ -326,43 +326,43 @@
                                Name="datatypes"\r
                                >\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\data-types\base64.c"\r
+                                       RelativePath="..\..\libetpan\src\data-types\base64.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\data-types\carray.c"\r
+                                       RelativePath="..\..\libetpan\src\data-types\carray.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\data-types\charconv.c"\r
+                                       RelativePath="..\..\libetpan\src\data-types\charconv.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\data-types\chash.c"\r
+                                       RelativePath="..\..\libetpan\src\data-types\chash.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\data-types\cinthash.c"\r
+                                       RelativePath="..\..\libetpan\src\data-types\cinthash.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\data-types\clist.c"\r
+                                       RelativePath="..\..\libetpan\src\data-types\clist.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\data-types\connect.c"\r
+                                       RelativePath="..\..\libetpan\src\data-types\connect.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\data-types\mail_cache_db.c"\r
+                                       RelativePath="..\..\libetpan\src\data-types\mail_cache_db.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\data-types\maillock.c"\r
+                                       RelativePath="..\..\libetpan\src\data-types\maillock.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\data-types\mailsem.c"\r
+                                       RelativePath="..\..\libetpan\src\data-types\mailsem.c"\r
                                        >\r
                                        <FileConfiguration\r
                                                Name="Debug|Win32"\r
@@ -382,27 +382,27 @@
                                        </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\data-types\mailstream.c"\r
+                                       RelativePath="..\..\libetpan\src\data-types\mailstream.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\data-types\mailstream_helper.c"\r
+                                       RelativePath="..\..\libetpan\src\data-types\mailstream_helper.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\data-types\mailstream_low.c"\r
+                                       RelativePath="..\..\libetpan\src\data-types\mailstream_low.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\data-types\mailstream_socket.c"\r
+                                       RelativePath="..\..\libetpan\src\data-types\mailstream_socket.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\data-types\mailstream_ssl.c"\r
+                                       RelativePath="..\..\libetpan\src\data-types\mailstream_ssl.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\data-types\mapping.c"\r
+                                       RelativePath="..\..\libetpan\src\data-types\mapping.c"\r
                                        >\r
                                        <FileConfiguration\r
                                                Name="Debug|Win32"\r
@@ -422,11 +422,11 @@
                                        </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\data-types\md5.c"\r
+                                       RelativePath="..\..\libetpan\src\data-types\md5.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\data-types\mmapstring.c"\r
+                                       RelativePath="..\..\libetpan\src\data-types\mmapstring.c"\r
                                        >\r
                                </File>\r
                        </Filter>\r
@@ -437,79 +437,95 @@
                                        Name="imap"\r
                                        >\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\acl.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\acl.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\acl_parser.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\acl_parser.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\acl_sender.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\acl_sender.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\acl_types.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\acl_types.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\annotatemore.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\annotatemore.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\annotatemore_parser.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\annotatemore_parser.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\annotatemore_sender.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\annotatemore_sender.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\annotatemore_types.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\annotatemore_types.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\mailimap.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_extension.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\mailimap_extension.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_helper.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\mailimap_helper.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_keywords.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\mailimap_keywords.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_parser.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\mailimap_parser.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_print.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\mailimap_print.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_sender.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\mailimap_sender.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_socket.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\mailimap_socket.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_ssl.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\mailimap_ssl.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_types.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\mailimap_types.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imap\mailimap_types_helper.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\mailimap_types_helper.c"\r
+                                               >\r
+                                       </File>\r
+                                       <File\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\uidplus.c"\r
+                                               >\r
+                                       </File>\r
+                                       <File\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\uidplus_parser.c"\r
+                                               >\r
+                                       </File>\r
+                                       <File\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\uidplus_sender.c"\r
+                                               >\r
+                                       </File>\r
+                                       <File\r
+                                               RelativePath="..\..\libetpan\src\low-level\imap\uidplus_types.c"\r
                                                >\r
                                        </File>\r
                                </Filter>\r
@@ -517,19 +533,19 @@
                                        Name="pop3"\r
                                        >\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\pop3\mailpop3.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\pop3\mailpop3.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\pop3\mailpop3_helper.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\pop3\mailpop3_helper.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\pop3\mailpop3_socket.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\pop3\mailpop3_socket.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\pop3\mailpop3_ssl.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\pop3\mailpop3_ssl.c"\r
                                                >\r
                                        </File>\r
                                </Filter>\r
@@ -537,31 +553,31 @@
                                        Name="mime"\r
                                        >\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\mime\mailmime.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime_content.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\mime\mailmime_content.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime_decode.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\mime\mailmime_decode.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime_disposition.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\mime\mailmime_disposition.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime_types.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\mime\mailmime_types.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime_types_helper.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\mime\mailmime_types_helper.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime_write.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\mime\mailmime_write.c"\r
                                                >\r
                                                <FileConfiguration\r
                                                        Name="Debug|Win32"\r
@@ -581,15 +597,15 @@
                                                </FileConfiguration>\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime_write_file.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\mime\mailmime_write_file.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime_write_generic.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\mime\mailmime_write_generic.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\mime\mailmime_write_mem.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\mime\mailmime_write_mem.c"\r
                                                >\r
                                        </File>\r
                                </Filter>\r
@@ -597,19 +613,19 @@
                                        Name="imf"\r
                                        >\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imf\mailimf.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imf\mailimf.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imf\mailimf_types.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imf\mailimf_types.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imf\mailimf_types_helper.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imf\mailimf_types_helper.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imf\mailimf_write.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imf\mailimf_write.c"\r
                                                >\r
                                                <FileConfiguration\r
                                                        Name="Debug|Win32"\r
@@ -629,15 +645,15 @@
                                                </FileConfiguration>\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imf\mailimf_write_file.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imf\mailimf_write_file.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imf\mailimf_write_generic.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imf\mailimf_write_generic.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\imf\mailimf_write_mem.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\imf\mailimf_write_mem.c"\r
                                                >\r
                                        </File>\r
                                </Filter>\r
@@ -645,7 +661,7 @@
                                        Name="maildir"\r
                                        >\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\maildir\maildir.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\maildir\maildir.c"\r
                                                >\r
                                        </File>\r
                                </Filter>\r
@@ -653,15 +669,15 @@
                                        Name="mbox"\r
                                        >\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\mbox\mailmbox.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\mbox\mailmbox.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\mbox\mailmbox_parse.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\mbox\mailmbox_parse.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\mbox\mailmbox_types.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\mbox\mailmbox_types.c"\r
                                                >\r
                                        </File>\r
                                </Filter>\r
@@ -669,7 +685,7 @@
                                        Name="mh"\r
                                        >\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\mh\mailmh.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\mh\mailmh.c"\r
                                                >\r
                                        </File>\r
                                </Filter>\r
@@ -677,15 +693,15 @@
                                        Name="nntp"\r
                                        >\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\nntp\newsnntp.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\nntp\newsnntp.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\nntp\newsnntp_socket.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\nntp\newsnntp_socket.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\nntp\newsnntp_ssl.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\nntp\newsnntp_ssl.c"\r
                                                >\r
                                        </File>\r
                                </Filter>\r
@@ -693,19 +709,19 @@
                                        Name="smtp"\r
                                        >\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\smtp\mailsmtp.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\smtp\mailsmtp.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\smtp\mailsmtp_helper.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\smtp\mailsmtp_helper.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\smtp\mailsmtp_socket.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\smtp\mailsmtp_socket.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\low-level\smtp\mailsmtp_ssl.c"\r
+                                               RelativePath="..\..\libetpan\src\low-level\smtp\mailsmtp_ssl.c"\r
                                                >\r
                                        </File>\r
                                </Filter>\r
@@ -717,43 +733,43 @@
                                        Name="interface"\r
                                        >\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\driver\interface\maildriver.c"\r
+                                               RelativePath="..\..\libetpan\src\driver\interface\maildriver.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\driver\interface\maildriver_tools.c"\r
+                                               RelativePath="..\..\libetpan\src\driver\interface\maildriver_tools.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\driver\interface\maildriver_types.c"\r
+                                               RelativePath="..\..\libetpan\src\driver\interface\maildriver_types.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\driver\interface\maildriver_types_helper.c"\r
+                                               RelativePath="..\..\libetpan\src\driver\interface\maildriver_types_helper.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\driver\interface\mailfolder.c"\r
+                                               RelativePath="..\..\libetpan\src\driver\interface\mailfolder.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\driver\interface\mailmessage.c"\r
+                                               RelativePath="..\..\libetpan\src\driver\interface\mailmessage.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\driver\interface\mailmessage_tools.c"\r
+                                               RelativePath="..\..\libetpan\src\driver\interface\mailmessage_tools.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\driver\interface\mailmessage_types.c"\r
+                                               RelativePath="..\..\libetpan\src\driver\interface\mailmessage_types.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\driver\interface\mailstorage.c"\r
+                                               RelativePath="..\..\libetpan\src\driver\interface\mailstorage.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\driver\interface\mailstorage_tools.c"\r
+                                               RelativePath="..\..\libetpan\src\driver\interface\mailstorage_tools.c"\r
                                                >\r
                                        </File>\r
                                </Filter>\r
@@ -764,7 +780,7 @@
                                                Name="data-message"\r
                                                >\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\data-message\data_message_driver.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\data-message\data_message_driver.c"\r
                                                        >\r
                                                </File>\r
                                        </Filter>\r
@@ -772,7 +788,7 @@
                                                Name="db"\r
                                                >\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\db\dbdriver.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\db\dbdriver.c"\r
                                                        >\r
                                                        <FileConfiguration\r
                                                                Name="Debug|Win32"\r
@@ -792,7 +808,7 @@
                                                        </FileConfiguration>\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\db\dbdriver_message.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\db\dbdriver_message.c"\r
                                                        >\r
                                                        <FileConfiguration\r
                                                                Name="Debug|Win32"\r
@@ -812,7 +828,7 @@
                                                        </FileConfiguration>\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\db\dbstorage.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\db\dbstorage.c"\r
                                                        >\r
                                                        <FileConfiguration\r
                                                                Name="Debug|Win32"\r
@@ -836,7 +852,7 @@
                                                Name="hotmail"\r
                                                >\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\hotmail\hotmailstorage.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\hotmail\hotmailstorage.c"\r
                                                        >\r
                                                </File>\r
                                        </Filter>\r
@@ -844,27 +860,27 @@
                                                Name="imap"\r
                                                >\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\imap\imapdriver.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\imap\imapdriver.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\imap\imapdriver_cached.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\imap\imapdriver_cached.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\imap\imapdriver_cached_message.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\imap\imapdriver_cached_message.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\imap\imapdriver_message.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\imap\imapdriver_message.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\imap\imapdriver_tools.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\imap\imapdriver_tools.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\imap\imapstorage.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\imap\imapstorage.c"\r
                                                        >\r
                                                </File>\r
                                        </Filter>\r
@@ -872,27 +888,27 @@
                                                Name="maildir"\r
                                                >\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\maildir\maildirdriver.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\maildir\maildirdriver.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\maildir\maildirdriver_cached.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\maildir\maildirdriver_cached.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\maildir\maildirdriver_cached_message.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\maildir\maildirdriver_cached_message.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\maildir\maildirdriver_message.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\maildir\maildirdriver_message.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\maildir\maildirdriver_tools.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\maildir\maildirdriver_tools.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\maildir\maildirstorage.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\maildir\maildirstorage.c"\r
                                                        >\r
                                                </File>\r
                                        </Filter>\r
@@ -900,27 +916,27 @@
                                                Name="mbox"\r
                                                >\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\mbox\mboxdriver.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\mbox\mboxdriver.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\mbox\mboxdriver_cached.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\mbox\mboxdriver_cached.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\mbox\mboxdriver_cached_message.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\mbox\mboxdriver_cached_message.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\mbox\mboxdriver_message.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\mbox\mboxdriver_message.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\mbox\mboxdriver_tools.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\mbox\mboxdriver_tools.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\mbox\mboxstorage.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\mbox\mboxstorage.c"\r
                                                        >\r
                                                </File>\r
                                        </Filter>\r
@@ -928,27 +944,27 @@
                                                Name="mh"\r
                                                >\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\mh\mhdriver.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\mh\mhdriver.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\mh\mhdriver_cached.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\mh\mhdriver_cached.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\mh\mhdriver_cached_message.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\mh\mhdriver_cached_message.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\mh\mhdriver_message.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\mh\mhdriver_message.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\mh\mhdriver_tools.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\mh\mhdriver_tools.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\mh\mhstorage.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\mh\mhstorage.c"\r
                                                        >\r
                                                </File>\r
                                        </Filter>\r
@@ -956,7 +972,7 @@
                                                Name="mime-message"\r
                                                >\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\mime-message\mime_message_driver.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\mime-message\mime_message_driver.c"\r
                                                        >\r
                                                </File>\r
                                        </Filter>\r
@@ -964,27 +980,27 @@
                                                Name="nntp"\r
                                                >\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\nntp\nntpdriver.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\nntp\nntpdriver.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\nntp\nntpdriver_cached.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\nntp\nntpdriver_cached.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\nntp\nntpdriver_cached_message.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\nntp\nntpdriver_cached_message.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\nntp\nntpdriver_message.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\nntp\nntpdriver_message.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\nntp\nntpdriver_tools.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\nntp\nntpdriver_tools.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\nntp\nntpstorage.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\nntp\nntpstorage.c"\r
                                                        >\r
                                                </File>\r
                                        </Filter>\r
@@ -992,27 +1008,27 @@
                                                Name="pop3"\r
                                                >\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\pop3\pop3driver.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\pop3\pop3driver.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\pop3\pop3driver_cached.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\pop3\pop3driver_cached.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\pop3\pop3driver_cached_message.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\pop3\pop3driver_cached_message.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\pop3\pop3driver_message.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\pop3\pop3driver_message.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\pop3\pop3driver_tools.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\pop3\pop3driver_tools.c"\r
                                                        >\r
                                                </File>\r
                                                <File\r
-                                                       RelativePath="..\..\libetpan-0.46\src\driver\implementation\pop3\pop3storage.c"\r
+                                                       RelativePath="..\..\libetpan\src\driver\implementation\pop3\pop3storage.c"\r
                                                        >\r
                                                </File>\r
                                        </Filter>\r
@@ -1021,19 +1037,19 @@
                                        Name="tools"\r
                                        >\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\driver\tools\generic_cache.c"\r
+                                               RelativePath="..\..\libetpan\src\driver\tools\generic_cache.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\driver\tools\imfcache.c"\r
+                                               RelativePath="..\..\libetpan\src\driver\tools\imfcache.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\driver\tools\mailthread.c"\r
+                                               RelativePath="..\..\libetpan\src\driver\tools\mailthread.c"\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\..\libetpan-0.46\src\driver\tools\mailthread_types.c"\r
+                                               RelativePath="..\..\libetpan\src\driver\tools\mailthread_types.c"\r
                                                >\r
                                        </File>\r
                                </Filter>\r
@@ -1042,23 +1058,23 @@
                                Name="Windows"\r
                                >\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\windows\dirent.c"\r
+                                       RelativePath="..\..\libetpan\src\windows\dirent.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\windows\misc.c"\r
+                                       RelativePath="..\..\libetpan\src\windows\misc.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\windows\mmap.c"\r
+                                       RelativePath="..\..\libetpan\src\windows\mmap.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\windows\time_r.c"\r
+                                       RelativePath="..\..\libetpan\src\windows\time_r.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libetpan-0.46\src\windows\wsocket.cpp"\r
+                                       RelativePath="..\..\libetpan\src\windows\wsocket.cpp"\r
                                        >\r
                                        <FileConfiguration\r
                                                Name="Debug|Win32"\r