From: Tim Kientzle <kientzle@acm.org>
Date: Sat, 21 Apr 2012 19:40:15 +0000 (-0700)
Subject: Fix the setup_acls placeholder used on systems where we don't have
X-Git-Tag: v3.1.0~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6d3cd33aecdc579966c3fbe7b9424cea83c7555;p=thirdparty%2Flibarchive.git

Fix the setup_acls placeholder used on systems where we don't have
system-dependent ACL support yet.
---

diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index 8c6be14f6..7987fa5b3 100644
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -642,7 +642,7 @@ translate_acl(struct archive_read_disk *a,
 #else
 static int
 setup_acls(struct archive_read_disk *a,
-    struct archive_entry *entry, int fd)
+    struct archive_entry *entry, int *fd)
 {
 	(void)a;      /* UNUSED */
 	(void)entry;  /* UNUSED */