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 4f68ef85f30767b992ce0a5db2a06ba78c82f714..0f0c3d66f93a4f543bcd8b93b21217ae35334b97 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 8e1c01830e4b05ada0fd5fedbacce0773f3eaa4d..557e3c6cbd559d008d40da563aa484ddba8dd7db 100644 (file)
--- a/libarchive/archive_write_set_format_iso9660.c
+++ b/libarchive/archive_write_set_format_iso9660.c
@@ -7774,7 +7774,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) {