From: Martin Matuska <martin@matuska.org>
Date: Mon, 20 Mar 2017 11:30:24 +0000 (+0100)
Subject: Always include extern keyword for ACL map constants
X-Git-Tag: v3.3.2~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e37a9e051bb7674115ca1e262551a070a92283a;p=thirdparty%2Flibarchive.git

Always include extern keyword for ACL map constants
---

diff --git a/libarchive/archive_acl_maps.h b/libarchive/archive_acl_maps.h
index c9dba525e..e3f440828 100644
--- a/libarchive/archive_acl_maps.h
+++ b/libarchive/archive_acl_maps.h
@@ -37,7 +37,6 @@ typedef struct {
 	const int p_perm;	/* Platform permission or flag */
 } acl_perm_map_t;
 
-#ifndef _ARCHIVE_ACL_MAPS_DEFS
 #if ARCHIVE_ACL_POSIX1E
 extern const acl_perm_map_t acl_posix_perm_map[];
 extern const int acl_posix_perm_map_size;
@@ -48,5 +47,4 @@ extern const int acl_nfs4_perm_map_size;
 extern const acl_perm_map_t acl_nfs4_flag_map[];
 extern const int acl_nfs4_flag_map_size;
 #endif
-#endif /* !_ARCHIVE_ACL_MAPS_DEFS */
 #endif /* ARCHIVE_ACL_MAPS_H_INCLUDED */
diff --git a/libarchive/archive_acl_maps_darwin.c b/libarchive/archive_acl_maps_darwin.c
index eaa046ce4..af0f4c3ee 100644
--- a/libarchive/archive_acl_maps_darwin.c
+++ b/libarchive/archive_acl_maps_darwin.c
@@ -36,7 +36,6 @@
 #include "archive_entry.h"
 #include "archive_private.h"
 #include "archive_read_disk_private.h"
-#define _ARCHIVE_ACL_MAPS_DEFS
 #include "archive_acl_maps.h"
 
 const acl_perm_map_t acl_nfs4_perm_map[] = {
diff --git a/libarchive/archive_acl_maps_freebsd.c b/libarchive/archive_acl_maps_freebsd.c
index 222dcff17..17b1e953a 100644
--- a/libarchive/archive_acl_maps_freebsd.c
+++ b/libarchive/archive_acl_maps_freebsd.c
@@ -36,7 +36,6 @@
 #include "archive_entry.h"
 #include "archive_private.h"
 #include "archive_read_disk_private.h"
-#define _ARCHIVE_ACL_MAPS_DEFS
 #include "archive_acl_maps.h"
 
 const acl_perm_map_t acl_posix_perm_map[] = {
diff --git a/libarchive/archive_acl_maps_linux.c b/libarchive/archive_acl_maps_linux.c
index 3476e12c1..04f630eb8 100644
--- a/libarchive/archive_acl_maps_linux.c
+++ b/libarchive/archive_acl_maps_linux.c
@@ -39,7 +39,6 @@
 #include "archive_entry.h"
 #include "archive_private.h"
 #include "archive_read_disk_private.h"
-#define _ARCHIVE_ACL_MAPS_DEFS
 #include "archive_acl_maps.h"
 
 #if ARCHIVE_ACL_LIBACL
diff --git a/libarchive/archive_acl_maps_sunos.c b/libarchive/archive_acl_maps_sunos.c
index 2197d5011..bdc869d17 100644
--- a/libarchive/archive_acl_maps_sunos.c
+++ b/libarchive/archive_acl_maps_sunos.c
@@ -36,7 +36,6 @@
 #include "archive_entry.h"
 #include "archive_private.h"
 #include "archive_read_disk_private.h"
-#define _ARCHIVE_ACL_MAPS_DEFS
 #include "archive_acl_maps.h"
 
 const acl_perm_map_t acl_posix_perm_map[] = {