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 0d3bc4e..48ad016 100644
--- 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 @@
}
return (ret);
}
+#endif /* ARCHIVE_ACL_DARWIN */
diff --git a/libarchive/archive_disk_acl_freebsd.c b/libarchive/archive_disk_acl_freebsd.c
index eff9c22..07d08ff 100644
--- 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 @@
#endif
return (ret);
}
+#endif /* ARCHIVE_ACL_FREEBSD */
diff --git a/libarchive/archive_disk_acl_linux.c b/libarchive/archive_disk_acl_linux.c
index 6e9288d..3928f3d 100644
--- 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 @@
#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 7d806b0..bc84fd6 100644
--- 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 @@
#endif
return (ret);
}
+#endif /* ARCHIVE_ACL_SUNOS */
