mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-02 20:00:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmSystemTools: Restore compilation with libarchive versions below 3.3.1

Browse Source 
In commit a203fcc63d (cmake: Teach '-E tar' to report errors copying
data, 2018-05-16) we introduced use of `la_ssize_t` but that was not
available until libarchive 3.3.1.  Switch to the `__LA_SSIZE_T` macro
we use elsewhere.
This commit is contained in:
Brad King
2018-06-01 13:26:34 -04:00
parent eed0df951d
commit 6d8ae1e6e4
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmSystemTools.cxx
View File

@@ -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));