From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sun, 25 Apr 2010 13:23:30 +0000 (-0400)
Subject: get_parent_and_basename() is used when HAVE_ZLIB_H(for zisofs support) is defined.
X-Git-Tag: v3.0.0a~1086
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02f8c567c293344dd24b5a7a63e1f10908765063;p=thirdparty%2Flibarchive.git

get_parent_and_basename() is used when HAVE_ZLIB_H(for zisofs support) is defined.

SVN-Revision: 2293
---

diff --git a/libarchive/archive_write_set_format_iso9660.c b/libarchive/archive_write_set_format_iso9660.c
index 2e877b83f..9864ab475 100644
--- a/libarchive/archive_write_set_format_iso9660.c
+++ b/libarchive/archive_write_set_format_iso9660.c
@@ -4804,6 +4804,7 @@ isofile_gen_utility_names(struct isofile *file)
 		file->dircnt ++;
 }
 
+#ifdef HAVE_ZLIB_H
 static void
 get_parent_and_base(struct archive_string *parentdir,
     struct archive_string *basename, const char *pathname)
@@ -4844,6 +4845,7 @@ get_parent_and_base(struct archive_string *parentdir,
 		archive_strcpy(basename,  slash + 1);
 	}
 }
+#endif /* HAVE_ZLIB_H */
 
 /*
  * Register a entry to get a hardlink target.