[Cmake-commits] CMake branch, next, updated. v2.8.8-3062-g8e4992d

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  8e4992d0c6ac84b2678ab8807c1de13efc66ebb4 (commit)
       via  54ffb5b4f121084fe368a80d9fa405a5c8254312 (commit)
      from  689459cc81d46bc87540a96e88712c6998945ba9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e4992d0c6ac84b2678ab8807c1de13efc66ebb4
commit 8e4992d0c6ac84b2678ab8807c1de13efc66ebb4
Merge: 689459c 54ffb5b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 7 15:25:32 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 7 15:25:32 2012 -0400

    Merge topic 'libarchive-sun' into next
    
    54ffb5b libarchive: Avoid 'inline' on SunPro < 5.9 (#13277)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54ffb5b4f121084fe368a80d9fa405a5c8254312
commit 54ffb5b4f121084fe368a80d9fa405a5c8254312
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 7 13:46:49 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 7 13:46:49 2012 -0400

    libarchive: Avoid 'inline' on SunPro < 5.9 (#13277)
    
    Suggested-by: Daniel R. Gomez <gomez at teragram.com>

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

-----------------------------------------------------------------------

Summary of changes:
 Utilities/cmlibarchive/libarchive/archive_endian.h |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake