diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-27 19:39:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-01-27 19:39:55 (GMT) |
| commit | dd2f81491e6e17681dd18882a8ccfa01fa32a3f7 (patch) | |
| tree | 6b782de32aeb462333d70747f269b1725e723e00 /Utilities/cmlibarchive/libarchive/archive.h | |
| parent | 949d32c3067830a1376950fc78dbcde39bc378a8 (diff) | |
| parent | 7679f9fab099e729b61320927a9e0b8d03546f7f (diff) | |
| download | CMake-dd2f81491e6e17681dd18882a8ccfa01fa32a3f7.zip CMake-dd2f81491e6e17681dd18882a8ccfa01fa32a3f7.tar.gz CMake-dd2f81491e6e17681dd18882a8ccfa01fa32a3f7.tar.bz2 | |
Merge branch 'dev/add_test-working-directory' into dev/strict-mode
Conflicts:
Tests/CMakeLists.txt
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive.h')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive.h | 8 |
1 files changed, 6 insertions, 2 deletions
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 |