From: Tim Kientzle <kientzle@acm.org>
Date: Sun, 26 Apr 2015 04:58:58 +0000 (-0700)
Subject: Use a macro wrapper on LL literals for compatibility with certain old Windows compilers.
X-Git-Tag: v3.1.900a~103^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=019673e89f11091701543b0836dd39683d379b60;p=thirdparty%2Flibarchive.git

Use a macro wrapper on LL literals for compatibility with certain old Windows compilers.
---

diff --git a/libarchive/archive_write_set_format_zip.c b/libarchive/archive_write_set_format_zip.c
index e69dc5888..975a4684f 100644
--- a/libarchive/archive_write_set_format_zip.c
+++ b/libarchive/archive_write_set_format_zip.c
@@ -1288,8 +1288,8 @@ archive_write_zip_close(struct archive_write *a)
 	offset_end = zip->written_bytes;
 
 	/* If central dir info is too large, write Zip64 end-of-cd */
-	if (offset_end - offset_start > 0xffffffffLL
-	    || offset_start > 0xffffffffLL
+	if (offset_end - offset_start > ARCHIVE_LITERAL_LL(0xffffffff)
+	    || offset_start > ARCHIVE_LITERAL_LL(0xffffffff)
 	    || zip->central_directory_entries > 0xffffUL
 	    || (zip->flags & ZIP_FLAG_FORCE_ZIP64)) {
 	  /* Zip64 end-of-cd record */