Browse Source

Merge topic 'libarchive-ssize_t'

6d8ae1e6e4 cmSystemTools: Restore compilation with libarchive versions below 3.3.1

Acked-by: Kitware Robot <[email protected]>
Merge-request: !2126
Brad King 7 years ago
parent
commit
003c30fa18
1 changed files with 5 additions and 1 deletions
  1. 5 1
      Source/cmSystemTools.cxx

+ 5 - 1
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));