diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-04 13:46:55 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-06-04 09:49:13 -0400 |
| commit | 003c30fa1867c90b0c1cd8e5c87a17c276d1756a (patch) | |
| tree | 4d624d5bac9db75c8e3f1fabab42b6538acf34e4 | |
| parent | 5a9a3d28a4a29124c61a42217780f57adcbcbae2 (diff) | |
| parent | 6d8ae1e6e4b597e171b14e46ed67c103b5f3135e (diff) | |
| download | cmake-003c30fa1867c90b0c1cd8e5c87a17c276d1756a.tar.gz | |
Merge topic 'libarchive-ssize_t'
6d8ae1e6e4 cmSystemTools: Restore compilation with libarchive versions below 3.3.1
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2126
| -rw-r--r-- | Source/cmSystemTools.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index d641a4e193..14f058010f 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -14,6 +14,9 @@ # ifndef __LA_INT64_T # define __LA_INT64_T la_int64_t # endif +# ifndef __LA_SSIZE_T +# define __LA_SSIZE_T la_ssize_t +# endif #endif #if defined(CMAKE_BUILD_WITH_CMAKE) @@ -1726,7 +1729,8 @@ bool copy_data(struct archive* ar, struct archive* aw) // Return value: // * >= ARCHIVE_OK - write succeed // * < ARCHIVE_OK - write failed - const la_ssize_t w_size = archive_write_data_block(aw, buff, size, offset); + const __LA_SSIZE_T w_size = + archive_write_data_block(aw, buff, size, offset); if (w_size < ARCHIVE_OK) { cmSystemTools::Message("archive_write_data_block()", archive_error_string(aw)); |