diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-24 14:31:22 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-02-24 14:31:22 (GMT) |
| commit | 33f636264a5d830f67316dc6184f4056b3a3629f (patch) | |
| tree | e6ac48bd3f34f86be4bed7f0e520555a1550b458 /Utilities/cmlibarchive/libarchive/archive_entry_locale.h | |
| parent | 8429068d7c37d06e53b871811760419ab3e36455 (diff) | |
| parent | d49176e91e4fb4ae31be1011c1029ca07d2cf494 (diff) | |
| download | CMake-33f636264a5d830f67316dc6184f4056b3a3629f.zip CMake-33f636264a5d830f67316dc6184f4056b3a3629f.tar.gz CMake-33f636264a5d830f67316dc6184f4056b3a3629f.tar.bz2 | |
Merge topic 'update-libarchive'
d49176e9 libarchive: Avoid using isblank
ce8f117f libarchive: Avoid declaration after statement in C code
e0f725f8 libarchive: Fix use of ssize_t in archive_entry.h
ae4861ec libarchive: Define __LA_DEPRECATED consistently
fecb70dd Update CMake pre-cached values for libarchive 3.3.0
a59a7ee9 Merge branch 'upstream-LibArchive' into update-libarchive
c206211a LibArchive 2017-02-19 (100ee75a)
cdce7c61 libarchive: Update script to get 3.3.0
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_entry_locale.h')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_entry_locale.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_entry_locale.h b/Utilities/cmlibarchive/libarchive/archive_entry_locale.h index 02e024a..44550c5 100644 --- a/Utilities/cmlibarchive/libarchive/archive_entry_locale.h +++ b/Utilities/cmlibarchive/libarchive/archive_entry_locale.h @@ -63,9 +63,13 @@ int _archive_entry_uname_l(struct archive_entry *, const char **, size_t *, struct archive_string_conv *); #define archive_entry_acl_text_l _archive_entry_acl_text_l int _archive_entry_acl_text_l(struct archive_entry *, int, - const char **, size_t *, struct archive_string_conv *); - - +const char **, size_t *, struct archive_string_conv *) __LA_DEPRECATED; +#define archive_entry_acl_to_text_l _archive_entry_acl_to_text_l +char *_archive_entry_acl_to_text_l(struct archive_entry *, ssize_t *, int, + struct archive_string_conv *); +#define archive_entry_acl_from_text_l _archive_entry_acl_from_text_l +int _archive_entry_acl_from_text_l(struct archive_entry *, const char* text, + int type, struct archive_string_conv *); #define archive_entry_copy_gname_l _archive_entry_copy_gname_l int _archive_entry_copy_gname_l(struct archive_entry *, const char *, size_t, struct archive_string_conv *); |