[Cmake-commits] CMake branch, next, updated. v2.8.2-743-g8ae0a03

[Bill Hoffman]

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  8ae0a038de4dedb709c1bcbf49829f9b0741245b (commit)
       via  92c082b1c9269a2fcbb9472b02adb3dd57a283ea (commit)
      from  fd2f09f2a8f7340540abadc722b57c139b65d81f (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=8ae0a038de4dedb709c1bcbf49829f9b0741245b
commit 8ae0a038de4dedb709c1bcbf49829f9b0741245b
Merge: fd2f09f 92c082b
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Sep 10 13:38:33 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 10 13:38:33 2010 -0400

    Merge topic 'fix_osf_build' into next
    
    92c082b Add a fix for the inline keyword on the osf os.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92c082b1c9269a2fcbb9472b02adb3dd57a283ea
commit 92c082b1c9269a2fcbb9472b02adb3dd57a283ea
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Sep 10 13:37:02 2010 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Fri Sep 10 13:37:02 2010 -0400

    Add a fix for the inline keyword on the osf os.

diff --git a/Utilities/cmlibarchive/libarchive/archive_endian.h b/Utilities/cmlibarchive/libarchive/archive_endian.h
index 067312d..58abee6 100644
--- a/Utilities/cmlibarchive/libarchive/archive_endian.h
+++ b/Utilities/cmlibarchive/libarchive/archive_endian.h
@@ -48,7 +48,7 @@
  */
 #if defined(__WATCOMC__) || defined(__sgi) || defined(__hpux) || defined(__BORLANDC__) || defined(__SUNPRO_C)
 #define inline
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) || defined(__osf__)
 #define inline __inline
 #endif
 

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

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


hooks/post-receive
-- 
CMake