summaryrefslogtreecommitdiffstats
path: root/lib/libarchive
diff options
context:
space:
mode:
authorkientzle <kientzle@FreeBSD.org>2009-03-03 03:28:09 +0000
committerkientzle <kientzle@FreeBSD.org>2009-03-03 03:28:09 +0000
commit7382504863c36f13bfb832bb8ccf9a57f563acdd (patch)
treefb1f965f226826a19f628ea7a462beb3026a4731 /lib/libarchive
parentf90b85d3baf78e6fb1f342779678c053356c3f10 (diff)
downloadFreeBSD-src-7382504863c36f13bfb832bb8ccf9a57f563acdd.zip
FreeBSD-src-7382504863c36f13bfb832bb8ccf9a57f563acdd.tar.gz
Merge r272 from libarchive.googlecode.com: Fix building on MSVC6.
Diffstat (limited to 'lib/libarchive')
-rw-r--r--lib/libarchive/archive_endian.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libarchive/archive_endian.h b/lib/libarchive/archive_endian.h
index 613395b..47739c0 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. */
OpenPOWER on IntegriCloud