From: Brad King <brad.king@kitware.com>
Date: Wed, 11 Jan 2012 13:15:14 +0000 (-0500)
Subject: Replace integer constant LL suffix with cast to int64_t
X-Git-Tag: v3.0.4~2^2~199
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=066da99412b605a5c99085aaae9ec7b2755ccaa7;p=thirdparty%2Flibarchive.git

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 4f68ef85f..0f0c3d66f 100644
--- 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 8e1c01830..557e3c6cb 100644
--- 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) {