MFV r310869:
Sync libarchive with vendor. Vendor bugfixes: Use __LA_DEPRECATED macro with functions deprecated in 379867e (r310796) MFC after: 2 weeks X-MFC with: r310866
This commit is contained in:
commit
739d7cfd6d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=310870
@ -105,6 +105,12 @@ typedef int64_t la_int64_t;
|
|||||||
# define __LA_DECL
|
# define __LA_DECL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(__GNUC__) && __GNUC__ >= 3 && __GNUC_MINOR__ >= 1
|
||||||
|
# define __LA_DEPRECATED __attribute__((deprecated))
|
||||||
|
#else
|
||||||
|
# define __LA_DEPRECATED
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
@ -529,9 +535,9 @@ __LA_DECL int archive_entry_acl_from_text(struct archive_entry *,
|
|||||||
|
|
||||||
/* Deprecated functions */
|
/* Deprecated functions */
|
||||||
__LA_DECL const wchar_t *archive_entry_acl_text_w(struct archive_entry *,
|
__LA_DECL const wchar_t *archive_entry_acl_text_w(struct archive_entry *,
|
||||||
int /* flags */) __attribute__ ((deprecated));
|
int /* flags */) __LA_DEPRECATED;
|
||||||
__LA_DECL const char *archive_entry_acl_text(struct archive_entry *,
|
__LA_DECL const char *archive_entry_acl_text(struct archive_entry *,
|
||||||
int /* flags */) __attribute__ ((deprecated));
|
int /* flags */) __LA_DEPRECATED;
|
||||||
|
|
||||||
/* Return bitmask of ACL types in an archive entry */
|
/* Return bitmask of ACL types in an archive entry */
|
||||||
__LA_DECL int archive_entry_acl_types(struct archive_entry *);
|
__LA_DECL int archive_entry_acl_types(struct archive_entry *);
|
||||||
|
@ -63,8 +63,7 @@ int _archive_entry_uname_l(struct archive_entry *,
|
|||||||
const char **, size_t *, struct archive_string_conv *);
|
const char **, size_t *, struct archive_string_conv *);
|
||||||
#define archive_entry_acl_text_l _archive_entry_acl_text_l
|
#define archive_entry_acl_text_l _archive_entry_acl_text_l
|
||||||
int _archive_entry_acl_text_l(struct archive_entry *, int,
|
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;
|
||||||
__attribute__ ((deprecated));
|
|
||||||
#define archive_entry_acl_to_text_l _archive_entry_acl_to_text_l
|
#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,
|
char *_archive_entry_acl_to_text_l(struct archive_entry *, ssize_t *, int,
|
||||||
struct archive_string_conv *);
|
struct archive_string_conv *);
|
||||||
|
Loading…
Reference in New Issue
Block a user