Replace integer constant LL suffix with cast to int64_t

The LL suffix is not portable.  Use an explicit cast instead.

SVN-Revision: 4127

diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
index 499037396d8da20bf3e7518dab9d74b5e91c92f5..fe4f35d8a325989ab5892dba089114940b521313 100644 (file)
--- a/libarchive/archive_read_support_format_iso9660.c
+++ b/libarchive/archive_read_support_format_iso9660.c
@@ -1406,7 +1406,7 @@ zisofs_read_data(struct archive_read *a,
 
                /* Allocate block pointers buffer. */
                ceil = (zisofs->pz_uncompressed_size +
-                       (1LL << zisofs->pz_log2_bs) - 1)
+                       (((int64_t)1) << zisofs->pz_log2_bs) - 1)
                        >> zisofs->pz_log2_bs;
                xsize = (ceil + 1) * 4;
                if (zisofs->block_pointers_alloc < xsize) {

diff --git a/libarchive/archive_write_set_format_iso9660.c b/libarchive/archive_write_set_format_iso9660.c
index 7d034eb00195ce5afc161ea1c729db79ec53adee..0231adc56c7c38c709259aee5b82e8fce884caa5 100644 (file)
--- a/libarchive/archive_write_set_format_iso9660.c
+++ b/libarchive/archive_write_set_format_iso9660.c
@@ -7777,7 +7777,7 @@ zisofs_extract_init(struct archive_write *a, struct zisofs_extract *zisofs,
 
        /* Allocate block pointers buffer. */
        ceil = (zisofs->pz_uncompressed_size +
-               (1LL << zisofs->pz_log2_bs) - 1)
+               (((int64_t)1) << zisofs->pz_log2_bs) - 1)
                >> zisofs->pz_log2_bs;
        xsize = (ceil + 1) * 4;
        if (zisofs->block_pointers == NULL) {