From: Tim Kientzle <kientzle@gmail.com>
Date: Mon, 8 Dec 2008 20:21:13 +0000 (-0500)
Subject: Windows: Use __inline in MSVC++ and include the new mtree writer
X-Git-Tag: v2.6.0~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97e4c8fb7829923bea2d1bda2e2a823c0756b4b2;p=thirdparty%2Flibarchive.git

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 285917fd4..3c62fbf53 100644
--- 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 9e909ff2d..e12ba8709 100644
--- a/windows/vc90/libarchive.vcproj
+++ b/windows/vc90/libarchive.vcproj
@@ -106,6 +106,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PLATFORM_CONFIG_H=&quot;\&quot;config_windows.h\&quot;&quot;"
 				RuntimeLibrary="2"
@@ -348,6 +349,10 @@
 				RelativePath="..\..\libarchive\archive_write_set_format_cpio_newc.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\libarchive\archive_write_set_format_mtree.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\libarchive\archive_write_set_format_pax.c"
 				>