[Cmake-commits] CMake branch, next, updated. v2.8.2-717-g1066e56

[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  1066e56d8f72d9b8e0be6f62cea3bce086323083 (commit)
       via  bd56626a4ad06d43c896c59c2065a3fd1cd3b73a (commit)
      from  7902a76524ccc1a33397db763f9f4523d28b15fe (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=1066e56d8f72d9b8e0be6f62cea3bce086323083
commit 1066e56d8f72d9b8e0be6f62cea3bce086323083
Merge: 7902a76 bd56626
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Sep 8 14:52:48 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 8 14:52:48 2010 -0400

    Merge topic 'fix_osf_build' into next
    
    bd56626 Fixes for the OSF operating system build.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd56626a4ad06d43c896c59c2065a3fd1cd3b73a
commit bd56626a4ad06d43c896c59c2065a3fd1cd3b73a
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Sep 8 14:50:14 2010 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Wed Sep 8 14:50:14 2010 -0400

    Fixes for the OSF operating system build.

diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index e95935a..8c10b21 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -512,6 +512,8 @@ CHECK_TYPE_SIZE(int64_t     INT64_T)
 IF(NOT HAVE_INT64_T)
   IF(WIN32)
     SET(int64_t "__int64")
+  ELSE(WIN32)
+    SET(int64_t "long long")
   ENDIF(WIN32)
 ENDIF(NOT HAVE_INT64_T)
 #
@@ -568,9 +570,7 @@ ENDIF(NOT HAVE_UINT16_T)
 #
 CHECK_TYPE_SIZE(uint32_t    UINT32_T)
 IF(NOT HAVE_UINT32_T)
-  IF(WIN32)
-    SET(uint32_t "unsigned int")
-  ENDIF(WIN32)
+  SET(uint32_t "unsigned int")
 ENDIF(NOT HAVE_UINT32_T)
 CHECK_TYPE_SIZE(int32_t    INT32_T)
 IF(NOT HAVE_INT32_T)
@@ -581,6 +581,8 @@ CHECK_TYPE_SIZE(uint64_t    UINT64_T)
 IF(NOT HAVE_UINT64_T)
   IF(WIN32)
     SET(uint64_t "unsigned __int64")
+  ELSE(WIN32)
+    SET(uint64_t "unsigned long long")
   ENDIF(WIN32)
 ENDIF(NOT HAVE_UINT64_T)
 #
diff --git a/Utilities/cmlibarchive/build/cmake/config.h.in b/Utilities/cmlibarchive/build/cmake/config.h.in
index 9af45a0..34dbce3 100644
--- a/Utilities/cmlibarchive/build/cmake/config.h.in
+++ b/Utilities/cmlibarchive/build/cmake/config.h.in
@@ -1,4 +1,7 @@
 /* config.h.  Generated from config.h.cmake by cmake configure */
+#if defined(__osf__)
+# define _OSF_SOURCE
+#endif
 
 /* Version number of bsdcpio */
 #cmakedefine BSDCPIO_VERSION_STRING "${BSDCPIO_VERSION_STRING}"
diff --git a/Utilities/cmlibarchive/libarchive/archive.h b/Utilities/cmlibarchive/libarchive/archive.h
index 9d84121..9b918a8 100644
--- a/Utilities/cmlibarchive/libarchive/archive.h
+++ b/Utilities/cmlibarchive/libarchive/archive.h
@@ -37,7 +37,7 @@
  */
 #if defined(__BORLANDC__) && __BORLANDC__ >= 0x560
 # define __LA_STDINT_H <stdint.h>
-#elif !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__INTERIX) && !defined(__BORLANDC__)
+#elif !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__INTERIX) && !defined(__BORLANDC__) && !defined(__osf__)
 # define __LA_STDINT_H <inttypes.h>
 #endif
 
@@ -68,7 +68,11 @@
 # endif
 #else
 #include <unistd.h>  /* ssize_t, uid_t, and gid_t */
-#define __LA_INT64_T    int64_t
+#if defined(__osf__)
+#  define __LA_INT64_T    long long
+#else
+#  define __LA_INT64_T    int64_t
+#endif
 #define __LA_SSIZE_T    ssize_t
 #define __LA_UID_T  uid_t
 #define __LA_GID_T  gid_t
diff --git a/Utilities/cmlibarchive/libarchive/archive_entry.h b/Utilities/cmlibarchive/libarchive/archive_entry.h
index 9c7cd43..e85285f 100644
--- a/Utilities/cmlibarchive/libarchive/archive_entry.h
+++ b/Utilities/cmlibarchive/libarchive/archive_entry.h
@@ -61,7 +61,11 @@
 # endif
 #else
 # include <unistd.h>
-#define __LA_INT64_T    int64_t
+#ifdef __osf__
+#  define __LA_INT64_T    long long
+#else
+#  define __LA_INT64_T    int64_t
+#endif
 #define __LA_UID_T  uid_t
 #define __LA_GID_T  gid_t
 #define __LA_DEV_T  dev_t

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

Summary of changes:
 Utilities/cmlibarchive/CMakeLists.txt             |    8 +++++---
 Utilities/cmlibarchive/build/cmake/config.h.in    |    3 +++
 Utilities/cmlibarchive/libarchive/archive.h       |    8 ++++++--
 Utilities/cmlibarchive/libarchive/archive_entry.h |    6 +++++-
 4 files changed, 19 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake