Always include extern keyword for ACL map constants

diff --git a/libarchive/archive_acl_maps.h b/libarchive/archive_acl_maps.h
index c9dba525e541da92c6991b7d579f57efe41e9c23..e3f4408286a1d97fe66f5605649c39f0bc0049a4 100644 (file)
--- 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 eaa046ce471fa6289bbfd68ff6fea5b509daf2fa..af0f4c3eef9f38648a0ec750fe3aa75b8fe53d0c 100644 (file)
--- 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 222dcff172d936fa8517f1d6a76968172ba99df4..17b1e953a39685367f3a8262e6c1a82998286cec 100644 (file)
--- 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 3476e12c19e1ec24dd2031c98b1e9ebd460f78e4..04f630eb84266bf639123da2a76a5e5ca38a0212 100644 (file)
--- 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 2197d5011affee0cd3f59bb179b19670d0fc70d9..bdc869d175f1849f3cb766c3529379b4d4deea61 100644 (file)
--- 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[] = {