Encapsulate archive_disk_acl.* in an ARCHIVE_ACL_* ifdef

This allows debugging and compilation with defines outside of configure.

diff --git a/libarchive/archive_disk_acl_darwin.c b/libarchive/archive_disk_acl_darwin.c
index 0d3bc4e9861f55562aec270d9a76e55ba6efe409..48ad01651265c17cb384020e8c8941c33131964e 100644 (file)
--- a/libarchive/archive_disk_acl_darwin.c
+++ b/libarchive/archive_disk_acl_darwin.c
@@ -25,6 +25,8 @@
 
 #include "archive_platform.h"
 
+#if ARCHIVE_ACL_DARWIN
+
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
@@ -554,3 +556,4 @@ archive_write_disk_set_acls(struct archive *a, int fd, const char *name,
        }
        return (ret);
 }
+#endif /* ARCHIVE_ACL_DARWIN */

diff --git a/libarchive/archive_disk_acl_freebsd.c b/libarchive/archive_disk_acl_freebsd.c
index eff9c22e94abc592d5d1fe3a60b52839350c25da..07d08ff962f4c084c0b5e48c82f62201c7429bea 100644 (file)
--- a/libarchive/archive_disk_acl_freebsd.c
+++ b/libarchive/archive_disk_acl_freebsd.c
@@ -27,6 +27,8 @@
 
 #include "archive_platform.h"
 
+#if ARCHIVE_ACL_FREEBSD
+
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
@@ -695,3 +697,4 @@ archive_write_disk_set_acls(struct archive *a, int fd, const char *name,
 #endif
        return (ret);
 }
+#endif /* ARCHIVE_ACL_FREEBSD */

diff --git a/libarchive/archive_disk_acl_linux.c b/libarchive/archive_disk_acl_linux.c
index 6e9288d221f92b403b5c716ac807d80547f7a168..3928f3d6fafdd6cecdd98bc9911d3ece1edb32fe 100644 (file)
--- a/libarchive/archive_disk_acl_linux.c
+++ b/libarchive/archive_disk_acl_linux.c
@@ -27,6 +27,8 @@
 
 #include "archive_platform.h"
 
+#if ARCHIVE_ACL_LIBACL || ARCHIVE_ACL_LIBRICHACL
+
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
@@ -738,3 +740,4 @@ archive_write_disk_set_acls(struct archive *a, int fd, const char *name,
 #endif /* ARCHIVE_ACL_LIBACL */
        return (ret);
 }
+#endif /* ARCHIVE_ACL_LIBACL || ARCHIVE_ACL_LIBRICHACL */

diff --git a/libarchive/archive_disk_acl_sunos.c b/libarchive/archive_disk_acl_sunos.c
index 7d806b016f90635fe6879a718728d3b95fdc429f..bc84fd6782f3d5237dc2d9e9738fe0aa4b471a91 100644 (file)
--- a/libarchive/archive_disk_acl_sunos.c
+++ b/libarchive/archive_disk_acl_sunos.c
@@ -25,6 +25,8 @@
 
 #include "archive_platform.h"
 
+#if ARCHIVE_ACL_SUNOS
+
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
@@ -816,3 +818,4 @@ archive_write_disk_set_acls(struct archive *a, int fd, const char *name,
 #endif
        return (ret);
 }
+#endif /* ARCHIVE_ACL_SUNOS */