From: Hanno <hanno@gentoo.org>
Date: Thu, 18 Aug 2016 03:51:59 +0000 (+0200)
Subject: conditionally declare r on ACL_TYPE_NFS4
X-Git-Tag: v3.2.2~34^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cb5e93d316b44f50d2893fc129e1fa17fb177a3;p=thirdparty%2Flibarchive.git

conditionally declare r on ACL_TYPE_NFS4
---

diff --git a/libarchive/archive_write_disk_acl.c b/libarchive/archive_write_disk_acl.c
index cbd202c2b..4c61054d1 100644
--- a/libarchive/archive_write_disk_acl.c
+++ b/libarchive/archive_write_disk_acl.c
@@ -138,6 +138,7 @@ set_acl(struct archive *a, int fd, const char *name,
 	acl_permset_t	 acl_permset;
 #ifdef ACL_TYPE_NFS4
 	acl_flagset_t	 acl_flagset;
+	int		 r;
 #endif
 	int		 ret;
 	int		 ae_type, ae_permset, ae_tag, ae_id;