summaryrefslogtreecommitdiffstats
path: root/lib/libarchive/archive_platform.h
diff options
context:
space:
mode:
authorkientzle <kientzle@FreeBSD.org>2005-08-10 15:01:03 +0000
committerkientzle <kientzle@FreeBSD.org>2005-08-10 15:01:03 +0000
commitae8fd24a2e511668f08a1eb498c80a0ba87f6b41 (patch)
treecee31d66febd55b64647f11ff2b146c7be68d541 /lib/libarchive/archive_platform.h
parent0f215b41b596a61aabbc2bafbe58b71a167c2b06 (diff)
downloadFreeBSD-src-ae8fd24a2e511668f08a1eb498c80a0ba87f6b41.zip
FreeBSD-src-ae8fd24a2e511668f08a1eb498c80a0ba87f6b41.tar.gz
Minor configuration fix to disable ACL support on MacOS X (which
lacks ACL_USER). Thanks to: Marcus Geiger, Joe Esch, and Markus Slopianka
Diffstat (limited to 'lib/libarchive/archive_platform.h')
-rw-r--r--lib/libarchive/archive_platform.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/libarchive/archive_platform.h b/lib/libarchive/archive_platform.h
index 92dded3..7213dcb 100644
--- a/lib/libarchive/archive_platform.h
+++ b/lib/libarchive/archive_platform.h
@@ -49,6 +49,7 @@
#define HAVE_ACL_SET_FD 1
#define HAVE_ACL_SET_FD_NP 1
#define HAVE_ACL_SET_FILE 1
+#define HAVE_ACL_USER 1
#endif
#define HAVE_BZLIB_H 1
#define HAVE_CHFLAGS 1
@@ -122,11 +123,11 @@
#endif
/*
- * If this platform has <sys/acl.h>, acl_create(), acl_init(), and
- * acl_set_file(), we assume it has the rest of the POSIX.1e draft
- * functions used in archive_read_extract.c.
+ * If this platform has <sys/acl.h>, acl_create(), acl_init(),
+ * acl_set_file(), and ACL_USER, we assume it has the rest of the
+ * POSIX.1e draft functions used in archive_read_extract.c.
*/
-#if HAVE_SYS_ACL_H && HAVE_ACL_CREATE_ENTRY && HAVE_ACL_INIT && HAVE_ACL_SET_FILE
+#if HAVE_SYS_ACL_H && HAVE_ACL_CREATE_ENTRY && HAVE_ACL_INIT && HAVE_ACL_SET_FILE && HAVE_ACL_USER
#define HAVE_POSIX_ACL 1
#endif
OpenPOWER on IntegriCloud