From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sun, 11 Nov 2012 10:54:24 +0000 (+0900)
Subject: Fix build failure on linux.
X-Git-Tag: v3.1.0~39^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be93783eaafd2f8675b6444452747441fc86bf15;p=thirdparty%2Flibarchive.git

Fix build failure on linux.
---

diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
index 377a98ba8..c31f93435 100644
--- a/libarchive/archive_read_support_format_zip.c
+++ b/libarchive/archive_read_support_format_zip.c
@@ -363,7 +363,7 @@ rsrc_cmp_key(const struct archive_rb_node *n, const void *key)
 }
 
 static const char *
-basename(const char *name, size_t name_length)
+rsrc_basename(const char *name, size_t name_length)
 {
 	const char *s, *r;
 
@@ -471,7 +471,7 @@ slurp_central_directory(struct archive_read *a, struct zip *zip)
 		    == NULL)
 			return ARCHIVE_FATAL;
 		name = p + 46;
-		r = basename(name, filename_length);
+		r = rsrc_basename(name, filename_length);
 		if (filename_length >= 9 &&
 		    strncmp("__MACOSX/", name, 9) == 0) {
 			/* If this file is not a resource fork nor