From 0373bf653182d0c08753dfc7f21167c244dcdbde Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Sat, 6 Dec 2008 06:12:24 +0000 Subject: [PATCH] A couple of portability fixes from Joerg Sonnenberger --- lib/libarchive/archive_endian.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libarchive/archive_endian.h b/lib/libarchive/archive_endian.h index 7613178fe7e0..613395bd4c0b 100644 --- a/lib/libarchive/archive_endian.h +++ b/lib/libarchive/archive_endian.h @@ -35,14 +35,14 @@ #define ARCHIVE_ENDIAN_H_INCLUDED -/* Watcom C++ doesn't support 'inline' in C code. (For any version?) */ -#if defined( __WATCOMC__ ) - #define inline -#endif - -/* Visual C++ 6.0 doesn't support 'inline' in C code. (Does VC7? VC8?) */ -#if defined(_MSC_VER) - #define inline +/* + * Disabling inline keyword for compilers known to choke on it: + * - Watcom C++ in C code. (For any version?) + * - SGI MIPSpro + * - Microsoft Visual C++ 6.0 (supposedly newer versions too) + */ +#if defined(__WATCOMC__) || defined(__sgi) || defined(_MSC_VER) +#define inline #endif /* Alignment-agnostic encode/decode bytestream to/from little/big endian. */