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 550be164029e3fb7f33d8d2344b547488fb3300f..bdeb6dea95645fb1bc9b04f887dd14cf56052d80 100644 (file)
--- 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. */