From 80bb6bf25992a9fde91ca770e8c231731566e999 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Tue, 3 Mar 2009 03:28:09 +0000 Subject: [PATCH] Merge r272 from libarchive.googlecode.com: Fix building on MSVC6. --- lib/libarchive/archive_endian.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libarchive/archive_endian.h b/lib/libarchive/archive_endian.h index 613395bd4c0b..47739c0d2464 100644 --- a/lib/libarchive/archive_endian.h +++ b/lib/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. */