From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Tue, 30 Oct 2012 17:10:14 +0000 (+0900)
Subject: Fix build failure on Mac OS X Mountain Lion.
X-Git-Tag: v3.1.0~40^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1aee4630c39576206fb0bc93df37adb3e4afee3;p=thirdparty%2Flibarchive.git

Fix build failure on Mac OS X Mountain Lion.
---

diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
index eae644e3c..5f10f2d1f 100644
--- a/libarchive/archive_read_support_format_iso9660.c
+++ b/libarchive/archive_read_support_format_iso9660.c
@@ -2885,7 +2885,7 @@ fatal_rr:
 	archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 	    "Failed to connect 'CL' pointer to 'RE' rr_moved pointer of "
 	    "Rockridge extensions: current position = %jd, CL offset = %jd",
-	    iso9660->current_position, file->cl_offset);
+	    (intmax_t)iso9660->current_position, (intmax_t)file->cl_offset);
 	return (ARCHIVE_FATAL);
 }
 
diff --git a/libarchive/archive_write_disk_posix.c b/libarchive/archive_write_disk_posix.c
index efd7897ac..ee84debe1 100644
--- a/libarchive/archive_write_disk_posix.c
+++ b/libarchive/archive_write_disk_posix.c
@@ -1316,7 +1316,7 @@ hfs_write_data_block(struct archive_write_disk *a, const char *buff,
 
 			memset(nullblock, 0, sizeof(nullblock));
 			while (skip > 0) {
-				if (skip > sizeof(nullblock))
+				if (skip > (int64_t)sizeof(nullblock))
 					bytes_written = hfs_write_decmpfs_block(
 					    a, nullblock, sizeof(nullblock));
 				else