From 54ffb5b4f121084fe368a80d9fa405a5c8254312 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 7 Jun 2012 13:46:49 -0400 Subject: libarchive: Avoid 'inline' on SunPro < 5.9 (#13277) Suggested-by: Daniel R. Gomez --- Utilities/cmlibarchive/libarchive/archive_endian.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Utilities/cmlibarchive/libarchive/archive_endian.h b/Utilities/cmlibarchive/libarchive/archive_endian.h index c3c78b3..bbf58fd 100644 --- a/Utilities/cmlibarchive/libarchive/archive_endian.h +++ b/Utilities/cmlibarchive/libarchive/archive_endian.h @@ -45,11 +45,14 @@ * - SGI MIPSpro * - Microsoft Visual C++ 6.0 (supposedly newer versions too) * - IBM VisualAge 6 (XL v6) + * - Sun WorkShop C (SunPro) before 5.9 */ #if defined(__WATCOMC__) || defined(__sgi) || defined(__hpux) || defined(__BORLANDC__) #define inline #elif defined(__IBMC__) && __IBMC__ < 700 #define inline +#elif defined(__SUNPRO_C) && __SUNPRO_C < 0x590 +#define inline #elif defined(_MSC_VER) || defined(__osf__) #define inline __inline #endif -- cgit v0.12