diff options
| author | Brad King <brad.king@kitware.com> | 2011-12-20 18:53:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-12-23 21:04:58 (GMT) |
| commit | 7dba0d668f4abcf39b3b828d89ea813ebc316152 (patch) | |
| tree | d9e1c456d23e7fe3e6f122b78c75d7df27b96f3d /Utilities | |
| parent | 0f7a85349a101e98de178e319f9df2a08c37c453 (diff) | |
| download | CMake-7dba0d668f4abcf39b3b828d89ea813ebc316152.zip CMake-7dba0d668f4abcf39b3b828d89ea813ebc316152.tar.gz CMake-7dba0d668f4abcf39b3b828d89ea813ebc316152.tar.bz2 | |
libarchive: Port to OSF operating system
Make changes equivalent to those originally made by commits
bd56626a (Fixes for the OSF operating system build, 2010-09-08)
92c082b1 (Add a fix for the inline keyword on the osf os, 2010-09-10)
but based on the updated libarchive snapshot.
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmlibarchive/build/cmake/config.h.in | 3 | ||||
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive.h | 4 | ||||
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_endian.h | 2 | ||||
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_entry.h | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/Utilities/cmlibarchive/build/cmake/config.h.in b/Utilities/cmlibarchive/build/cmake/config.h.in index b169051..b404be3 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 build/cmake/config.h.in by cmake configure */ +#if defined(__osf__) +# define _OSF_SOURCE +#endif /* * Ensure we have C99-style int64_t, etc, all defined. diff --git a/Utilities/cmlibarchive/libarchive/archive.h b/Utilities/cmlibarchive/libarchive/archive.h index 14c2aed..75475ca 100644 --- a/Utilities/cmlibarchive/libarchive/archive.h +++ b/Utilities/cmlibarchive/libarchive/archive.h @@ -41,7 +41,7 @@ */ #if defined(__BORLANDC__) && __BORLANDC__ >= 0x560 # include <stdint.h> -#elif !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__INTERIX) && !defined(__BORLANDC__) && !defined(_SCO_DS) +#elif !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__INTERIX) && !defined(__BORLANDC__) && !defined(_SCO_DS) && !defined(__osf__) # include <inttypes.h> #endif @@ -65,7 +65,7 @@ # endif #else # include <unistd.h> /* ssize_t, uid_t, and gid_t */ -# if defined(_SCO_DS) +# if defined(_SCO_DS) || defined(__osf__) # define __LA_INT64_T long long # else # define __LA_INT64_T int64_t diff --git a/Utilities/cmlibarchive/libarchive/archive_endian.h b/Utilities/cmlibarchive/libarchive/archive_endian.h index edc90ee..1dd8536 100644 --- a/Utilities/cmlibarchive/libarchive/archive_endian.h +++ b/Utilities/cmlibarchive/libarchive/archive_endian.h @@ -47,7 +47,7 @@ */ #if defined(__WATCOMC__) || defined(__sgi) || defined(__hpux) || defined(__BORLANDC__) #define inline -#elif defined(_MSC_VER) +#elif defined(_MSC_VER) || defined(__osf__) #define inline __inline #endif diff --git a/Utilities/cmlibarchive/libarchive/archive_entry.h b/Utilities/cmlibarchive/libarchive/archive_entry.h index fcd7657..906779a 100644 --- a/Utilities/cmlibarchive/libarchive/archive_entry.h +++ b/Utilities/cmlibarchive/libarchive/archive_entry.h @@ -64,7 +64,7 @@ # endif #else #include <unistd.h> -# if defined(_SCO_DS) +# if defined(_SCO_DS) || defined(__osf__) # define __LA_INT64_T long long # else # define __LA_INT64_T int64_t |