commit 3e37a9e051bb7674115ca1e262551a070a92283a
author Martin Matuska <martin@matuska.org> Mon Mar 20 12:30:24 2017 +0100
committer Martin Matuska <martin@matuska.org> Mon Mar 20 12:31:36 2017 +0100
tree b3eaa6948a26ec3f7acaa1ec6fe6782260aa50e1
parent 714d98c5c4edf82ee160cae33aa3d2a39953909c

Always include extern keyword for ACL map constants

libarchive/archive_acl_maps.h

diff --git a/libarchive/archive_acl_maps.h b/libarchive/archive_acl_maps.h
index c9dba52..e3f4408 100644
--- a/libarchive/archive_acl_maps.h
+++ b/libarchive/archive_acl_maps.h
@@ -37,7 +37,6 @@
 	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 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 */

libarchive/archive_acl_maps_darwin.c

diff --git a/libarchive/archive_acl_maps_darwin.c b/libarchive/archive_acl_maps_darwin.c
index eaa046c..af0f4c3 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[] = {

libarchive/archive_acl_maps_freebsd.c

diff --git a/libarchive/archive_acl_maps_freebsd.c b/libarchive/archive_acl_maps_freebsd.c
index 222dcff..17b1e95 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[] = {

libarchive/archive_acl_maps_linux.c

diff --git a/libarchive/archive_acl_maps_linux.c b/libarchive/archive_acl_maps_linux.c
index 3476e12..04f630e 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

libarchive/archive_acl_maps_sunos.c

diff --git a/libarchive/archive_acl_maps_sunos.c b/libarchive/archive_acl_maps_sunos.c
index 2197d50..bdc869d 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[] = {