diff options
author | Martin Matuska <mm@FreeBSD.org> | 2018-01-24 11:01:12 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2018-01-24 11:01:12 +0000 |
commit | a2160dbed3dca5a43147e805b79b35f55d150188 (patch) | |
tree | 03a9bb1ae2bda0343ac2c16865db6b563969a0e9 /tar | |
parent | 188b0da4f28dc7b295a2a13d917120fc11ee7a0d (diff) | |
download | src-a2160dbed3dca5a43147e805b79b35f55d150188.tar.gz src-a2160dbed3dca5a43147e805b79b35f55d150188.zip |
Update libarchive to git 2d9156bb3ad92c43c1e81546f4a2c21549ba248f
Relevant vendor changes:
PR #893: delete dead ppmd7 alloc callbacks
PR #904: Fix archive freeing bug in bsdcat
PR #961: Fix ZIP format names
PR #962: Don't modify attributes for existing directories
when ARCHIVE_EXTRACT_NO_OVERWRITE is set
PR #964: Fix -Werror=implicit-fallthrough= for GCC 7
PR #970: zip: Allow backslash as path separator
Notes
Notes:
svn path=/vendor/libarchive/dist/; revision=328323
Diffstat (limited to 'tar')
-rw-r--r-- | tar/test/test_option_acls.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tar/test/test_option_acls.c b/tar/test/test_option_acls.c index 325f319537af..f7451c8eb36b 100644 --- a/tar/test/test_option_acls.c +++ b/tar/test/test_option_acls.c @@ -85,7 +85,9 @@ static const acl_flag_t acl_flags[] = { ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_SUCCESSFUL_ACCESS, ACL_ENTRY_FAILED_ACCESS, +#ifdef ACL_ENTRY_INHERITED ACL_ENTRY_INHERITED +#endif #endif /* ARCHIVE_ACL_FREEBSD_NFS4 */ }; #endif /* ARCHIVE_ACL_DARWIN || ARCHIVE_ACL_FREEBSD_NFS4 */ |