[Cmake-commits] CMake branch, next, updated. v2.8.8-2650-g949724a

[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  949724ae67778eff539a1f745b4444a7b8528a19 (commit)
       via  09a91c6d5a2533ed2bccd116fcdb87458d602a98 (commit)
      from  f31998df5aa0c8f30d26ece1d9a3863e5b3c1a64 (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=949724ae67778eff539a1f745b4444a7b8528a19
commit 949724ae67778eff539a1f745b4444a7b8528a19
Merge: f31998d 09a91c6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 19 10:11:28 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 19 10:11:28 2012 -0400

    Merge topic 'compile-XL-v6' into next
    
    09a91c6 libarchive: Avoid 'inline' keyword on XL C v6 (#13148)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09a91c6d5a2533ed2bccd116fcdb87458d602a98
commit 09a91c6d5a2533ed2bccd116fcdb87458d602a98
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 19 09:49:43 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 19 09:49:43 2012 -0400

    libarchive: Avoid 'inline' keyword on XL C v6 (#13148)

diff --git a/Utilities/cmlibarchive/libarchive/archive_endian.h b/Utilities/cmlibarchive/libarchive/archive_endian.h
index 1dd8536..c3c78b3 100644
--- a/Utilities/cmlibarchive/libarchive/archive_endian.h
+++ b/Utilities/cmlibarchive/libarchive/archive_endian.h
@@ -44,9 +44,12 @@
  * - Watcom C++ in C code.  (For any version?)
  * - SGI MIPSpro
  * - Microsoft Visual C++ 6.0 (supposedly newer versions too)
+ * - IBM VisualAge 6 (XL v6)
  */
 #if defined(__WATCOMC__) || defined(__sgi) || defined(__hpux) || defined(__BORLANDC__)
 #define	inline
+#elif defined(__IBMC__) && __IBMC__ < 700
+#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