]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Fix build failure on Mac OS X Mountain Lion.
authorMichihiro NAKAJIMA <ggcueroad@gmail.com>
Tue, 30 Oct 2012 17:10:14 +0000 (02:10 +0900)
committerMichihiro NAKAJIMA <ggcueroad@gmail.com>
Tue, 30 Oct 2012 17:10:14 +0000 (02:10 +0900)
libarchive/archive_read_support_format_iso9660.c
libarchive/archive_write_disk_posix.c

index eae644e3c2d13dfee6021ecb947c167484d03877..5f10f2d1fcaa4a9b78c681e5d877f6deb9d788dd 100644 (file)
@@ -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);
 }
 
index efd7897ac1ac897c5c086db2d1627a8be3c03d71..ee84debe157f48acafafcdeb02a99e349dad6c58 100644 (file)
@@ -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