Merge topic 'libarchive-sun'

54ffb5b libarchive: Avoid 'inline' on SunPro < 5.9 (#13277)
This commit is contained in:
David Cole 2012-06-12 15:59:53 -04:00 committed by CMake Topic Stage
commit 909ddae2e4
1 changed files with 3 additions and 0 deletions

View File

@ -45,11 +45,14 @@
* - SGI MIPSpro * - SGI MIPSpro
* - Microsoft Visual C++ 6.0 (supposedly newer versions too) * - Microsoft Visual C++ 6.0 (supposedly newer versions too)
* - IBM VisualAge 6 (XL v6) * - IBM VisualAge 6 (XL v6)
* - Sun WorkShop C (SunPro) before 5.9
*/ */
#if defined(__WATCOMC__) || defined(__sgi) || defined(__hpux) || defined(__BORLANDC__) #if defined(__WATCOMC__) || defined(__sgi) || defined(__hpux) || defined(__BORLANDC__)
#define inline #define inline
#elif defined(__IBMC__) && __IBMC__ < 700 #elif defined(__IBMC__) && __IBMC__ < 700
#define inline #define inline
#elif defined(__SUNPRO_C) && __SUNPRO_C < 0x590
#define inline
#elif defined(_MSC_VER) || defined(__osf__) #elif defined(_MSC_VER) || defined(__osf__)
#define inline __inline #define inline __inline
#endif #endif