Windows: Use __inline in MSVC++ and include the new mtree writer

in the windows build.

SVN-Revision: 272

diff --git a/libarchive/archive_endian.h b/libarchive/archive_endian.h
index 285917fd4b434e7678ee5383ac3849df9f7fb91a..3c62fbf5305093ccc7cb4de8a1284a74a0dfb6cb 100644 (file)
--- a/libarchive/archive_endian.h
+++ b/libarchive/archive_endian.h
@@ -41,8 +41,10 @@
  * - SGI MIPSpro
  * - Microsoft Visual C++ 6.0 (supposedly newer versions too)
  */
-#if defined(__WATCOMC__) || defined(__sgi) || defined(_MSC_VER)
+#if defined(__WATCOMC__) || defined(__sgi)
 #define        inline
+#elif defined(_MSC_VER)
+#define inline __inline
 #endif
 
 /* Alignment-agnostic encode/decode bytestream to/from little/big endian. */

diff --git a/windows/vc90/libarchive.vcproj b/windows/vc90/libarchive.vcproj
index 9e909ff2dae7f93342180fdf38dd631728a1519e..e12ba87090057c014c6c3cd7f692643ef72a36df 100644 (file)
--- a/windows/vc90/libarchive.vcproj
+++ b/windows/vc90/libarchive.vcproj
@@ -106,6 +106,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories=""\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PLATFORM_CONFIG_H=&quot;\&quot;config_windows.h\&quot;&quot;"\r
                                RuntimeLibrary="2"\r
@@ -348,6 +349,10 @@
                                RelativePath="..\..\libarchive\archive_write_set_format_cpio_newc.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\libarchive\archive_write_set_format_mtree.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\libarchive\archive_write_set_format_pax.c"\r
                                >\r