From be93783eaafd2f8675b6444452747441fc86bf15 Mon Sep 17 00:00:00 2001 From: Michihiro NAKAJIMA Date: Sun, 11 Nov 2012 19:54:24 +0900 Subject: [PATCH] Fix build failure on linux. --- libarchive/archive_read_support_format_zip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 2.47.2