From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Tue, 27 Apr 2010 05:19:48 +0000 (-0400)
Subject: Unbreak build on the system which does not have zlib.
X-Git-Tag: v3.0.0a~1072
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=246f7344654c0b94d9673b31b301b193549e1570;p=thirdparty%2Flibarchive.git

Unbreak build on the system which does not have zlib.

SVN-Revision: 2318
---

diff --git a/libarchive/archive_write_set_format_iso9660.c b/libarchive/archive_write_set_format_iso9660.c
index 8b8a2968b..603639a10 100644
--- a/libarchive/archive_write_set_format_iso9660.c
+++ b/libarchive/archive_write_set_format_iso9660.c
@@ -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
 			}