diff options
| author | Martin Matuska <martin@matuska.org> | 2017-03-02 04:34:43 +0100 |
|---|---|---|
| committer | Martin Matuska <martin@matuska.org> | 2017-03-02 11:46:53 +0100 |
| commit | 60f0931d3b97e00616d7122321e34116d926bcc5 (patch) | |
| tree | 89e624377e6fa0d3e9cf2e208a5b2d612706c059 /test_utils | |
| parent | 784851b7b476f3cb2e1247c0f8913b8726c103d9 (diff) | |
| download | libarchive-60f0931d3b97e00616d7122321e34116d926bcc5.tar.gz | |
Reorganize ACL defines and fix detection of ACL_SYNCHRONIZE on Mac OS
Adjust MacOS part of test_acl_platform_nfs4
Diffstat (limited to 'test_utils')
| -rw-r--r-- | test_utils/test_common.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test_utils/test_common.h b/test_utils/test_common.h index 6cb26ae6..1e5c1fec 100644 --- a/test_utils/test_common.h +++ b/test_utils/test_common.h @@ -127,11 +127,14 @@ * 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_ACL_USER +#if HAVE_DECL_ACL_USER #define HAVE_POSIX_ACL 1 -#elif HAVE_ACL_TYPE_EXTENDED +#elif HAVE_DECL_ACL_TYPE_EXTENDED #define HAVE_DARWIN_ACL 1 #endif +#if HAVE_DECL_ACL_TYPE_NFS4 +#define HAVE_FREEBSD_NFS4_ACL 1 +#endif #endif /* @@ -148,7 +151,7 @@ #endif /* Define if platform supports NFSv4 ACLs */ -#if (HAVE_POSIX_ACL && HAVE_ACL_TYPE_NFS4) || HAVE_SUN_NFS4_ACL || HAVE_DARWIN_ACL +#if HAVE_FREEBSD_NFS4_ACL || HAVE_SUN_NFS4_ACL || HAVE_DARWIN_ACL #define HAVE_NFS4_ACL 1 #endif |