From: Martin Matuska <martin@matuska.org>
Date: Tue, 28 Mar 2017 09:40:25 +0000 (+0200)
Subject: Fix compilation on FreeBSD without NFSv4 ACL support
X-Git-Tag: v3.3.2~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc1b3ee3a997b027a0c443829a167a4aaeb04175;p=thirdparty%2Flibarchive.git

Fix compilation on FreeBSD without NFSv4 ACL support
---

diff --git a/libarchive/archive_disk_acl_freebsd.c b/libarchive/archive_disk_acl_freebsd.c
index 04a3fc065..eff9c22e9 100644
--- a/libarchive/archive_disk_acl_freebsd.c
+++ b/libarchive/archive_disk_acl_freebsd.c
@@ -105,11 +105,11 @@ translate_acl(struct archive_read_disk *a,
 #if ARCHIVE_ACL_FREEBSD_NFS4
 	int brand;
 	acl_flagset_t	 acl_flagset;
+	acl_entry_type_t acl_type;
 #endif
 	acl_tag_t	 acl_tag;
 	acl_entry_t	 acl_entry;
 	acl_permset_t	 acl_permset;
-	acl_entry_type_t acl_type;
 	int		 i, entry_acl_type, perm_map_size;
 	const acl_perm_map_t	*perm_map;
 	int		 r, s, ae_id, ae_tag, ae_perm;