diff options
| author | David Cole <david.cole@kitware.com> | 2012-06-12 19:59:53 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-06-12 19:59:53 (GMT) |
| commit | 909ddae2e45823d4a005ddf207cdf4421a08965d (patch) | |
| tree | 8fc7539d937a4a7a3baa09bcacd973b2cc1f73a7 | |
| parent | f848dbfe3ce57790bf4974cc2d142196228427f5 (diff) | |
| parent | 54ffb5b4f121084fe368a80d9fa405a5c8254312 (diff) | |
| download | CMake-909ddae2e45823d4a005ddf207cdf4421a08965d.zip CMake-909ddae2e45823d4a005ddf207cdf4421a08965d.tar.gz CMake-909ddae2e45823d4a005ddf207cdf4421a08965d.tar.bz2 | |
Merge topic 'libarchive-sun'
54ffb5b libarchive: Avoid 'inline' on SunPro < 5.9 (#13277)
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_endian.h | 3 |
1 files changed, 3 insertions, 0 deletions
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 |