Fix build failure when ACL_TYPE_NFS4 is not defined.

Signed-off-by: Andres Mejia <amejia004@gmail.com>

diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index 150897aebc26b0f5ec65880c4a70f87236afdf59..39c4c56e01d5e6f7c7921bc6fdc0ee7cea3ca123 100644 (file)
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -388,7 +388,7 @@ setup_mac_metadata(struct archive_read_disk *a,
 #endif
 
 
-#ifdef HAVE_POSIX_ACL
+#if defined(HAVE_POSIX_ACL) && defined(ACL_TYPE_NFS4)
 static int translate_acl(struct archive_read_disk *a,
     struct archive_entry *entry, acl_t acl, int archive_entry_acl_type);
 

diff --git a/libarchive/archive_write_disk_acl.c b/libarchive/archive_write_disk_acl.c
index 7953e0cf78eeab7ef0bd9029a99fb3c1efab141d..97972033c0808929340937030a0273a559dd2aae 100644 (file)
--- a/libarchive/archive_write_disk_acl.c
+++ b/libarchive/archive_write_disk_acl.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_write_disk.c 201159 2009-12-29 0
 #include "archive_acl_private.h"
 #include "archive_write_disk_private.h"
 
-#ifndef HAVE_POSIX_ACL
+#if !defined(HAVE_POSIX_ACL) || !defined(ACL_TYPE_NFS4)
 /* Default empty function body to satisfy mainline code. */
 int
 archive_write_disk_set_acls(struct archive *a, int fd, const char *name,