From: Joerg Sonnenberger <joerg.sonnenberger@gmail.com>
Date: Wed, 1 Oct 2008 14:06:08 +0000 (-0400)
Subject: Merge inline hacks into a single conditional. Add MIPSpro based
X-Git-Tag: v2.6.0~77
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f427f0a5816ca73a9f74afeabce0d61e1adeab3;p=thirdparty%2Flibarchive.git

Merge inline hacks into a single conditional. Add MIPSpro based
on report from Stuart Shelton in NetBSD PR 39628.

SVN-Revision: 216
---

diff --git a/libarchive/archive_endian.h b/libarchive/archive_endian.h
index 550be1640..bdeb6dea9 100644
--- a/libarchive/archive_endian.h
+++ b/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. */