]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Unbreak build on the system which does not have zlib.
authorMichihiro NAKAJIMA <ggcueroad@gmail.com>
Tue, 27 Apr 2010 05:19:48 +0000 (01:19 -0400)
committerMichihiro NAKAJIMA <ggcueroad@gmail.com>
Tue, 27 Apr 2010 05:19:48 +0000 (01:19 -0400)
SVN-Revision: 2318

libarchive/archive_write_set_format_iso9660.c

index 8b8a2968b2702b3db878f1c1ae01d4277f77e1b7..603639a107ab210a1a1c9fff0ab955eb441a17dc 100644 (file)
@@ -984,8 +984,10 @@ static void        isofile_free_all_entries(struct iso9660 *);
 static struct isofile * isofile_new(struct archive_entry *);
 static void    isofile_free(struct isofile *);
 static void    isofile_gen_utility_names(struct isofile *);
+#ifdef HAVE_ZLIB_H
 static void    get_parent_and_base(struct archive_string *,
                    struct archive_string *, const char *);
+#endif
 static int     isofile_register_hardlink(struct archive_write *,
                    struct isofile *);
 static void    isofile_connect_hardlink_files(struct iso9660 *);
@@ -1527,8 +1529,7 @@ iso9660_options(struct archive_write *a, const char *key, const char *value)
                                archive_set_error(&a->archive,
                                    ARCHIVE_ERRNO_MISC,
                                    "``zisofs'' "
-                                   "is not supported on this platform.",
-                                   value);
+                                   "is not supported on this platform.");
                                return (ARCHIVE_FATAL);
 #endif
                        }