diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-28 12:47:54 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-28 12:47:54 (GMT) |
| commit | f68f8a14161ee41c52cdb0725e57e56e15b42118 (patch) | |
| tree | ebe0c12f6540eead4e26bee26c5746e33066faac /Source | |
| parent | b28101c65fe47cb15390ac1ad4c85418071468d5 (diff) | |
| parent | b272a656552682e4042a65089703d6f78043ff18 (diff) | |
| download | CMake-f68f8a14161ee41c52cdb0725e57e56e15b42118.zip CMake-f68f8a14161ee41c52cdb0725e57e56e15b42118.tar.gz CMake-f68f8a14161ee41c52cdb0725e57e56e15b42118.tar.bz2 | |
Merge topic 'update-libarchive'
b272a656 cmSystemTools: Preemptively adapt to future libarchive 4.0 changes
87f1f363 cmArchiveWrite: Preemptively adapt to future libarchive 4.0 changes
45cd9e63 Update libarchive configuration within CMake
c09acf4f libarchive: Update README-CMake.txt for new snapshot
2f940f89 libarchive: Drop use of pthread.h for CMake build
1e473817 libarchive: Do not use pthread.h API without header
43d577dc libarchive: Test for Clang builtin before using it
85e0bb84 libarchive: Avoid using 'uint8_t' as bitfield type
c70491d6 libarchive: Avoid using name 'hz'
1bbba477 libarchive: Drop outdated CMake portability snprintf
64bdf0b7 libarchive: Avoid non-portable u_int8_t
8f837fc9 libarchive: Use CommonCrypto APIs on OS X only when available
61a0251e libarchive: Define O_CLOEXEC when missing
832fe4b1 libarchive: Fix VS 7.1 Debug build
0b82f51a libarchive: Guard bcyrpt.h with HAVE_BCRYPT_H
5333c04c libarchive: Drop CMake-specific Borland compiler workaround
...
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmArchiveWrite.cxx | 4 | ||||
| -rw-r--r-- | Source/cmSystemTools.cxx | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx index 7946950..e62a2ed 100644 --- a/Source/cmArchiveWrite.cxx +++ b/Source/cmArchiveWrite.cxx @@ -18,6 +18,10 @@ #include <cm_libarchive.h> #include "cm_get_date.h" +#ifndef __LA_SSIZE_T +# define __LA_SSIZE_T la_ssize_t +#endif + //---------------------------------------------------------------------------- static std::string cm_archive_error_string(struct archive* a) { diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 2c5aa8a..b2827dc 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -29,6 +29,9 @@ # include "cmArchiveWrite.h" # include "cmLocale.h" # include <cm_libarchive.h> +# ifndef __LA_INT64_T +# define __LA_INT64_T la_int64_t +# endif #endif #include <cmsys/FStream.hxx> #include <cmsys/Terminal.h> |