Date: Fri, 30 Dec 2016 23:05:06 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r310870 - head/contrib/libarchive/libarchive Message-ID: <201612302305.uBUN5640047755@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Fri Dec 30 23:05:06 2016 New Revision: 310870 URL: https://svnweb.freebsd.org/changeset/base/310870 Log: 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 Modified: head/contrib/libarchive/libarchive/archive_entry.h head/contrib/libarchive/libarchive/archive_entry_locale.h Directory Properties: head/contrib/libarchive/ (props changed) Modified: head/contrib/libarchive/libarchive/archive_entry.h ============================================================================== --- head/contrib/libarchive/libarchive/archive_entry.h Fri Dec 30 23:00:00 2016 (r310869) +++ head/contrib/libarchive/libarchive/archive_entry.h Fri Dec 30 23:05:06 2016 (r310870) @@ -105,6 +105,12 @@ typedef int64_t la_int64_t; # define __LA_DECL #endif +#if defined(__GNUC__) && __GNUC__ >= 3 && __GNUC_MINOR__ >= 1 +# define __LA_DEPRECATED __attribute__((deprecated)) +#else +# define __LA_DEPRECATED +#endif + #ifdef __cplusplus extern "C" { #endif @@ -529,9 +535,9 @@ __LA_DECL int archive_entry_acl_from_tex /* Deprecated functions */ __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 *, - int /* flags */) __attribute__ ((deprecated)); + int /* flags */) __LA_DEPRECATED; /* Return bitmask of ACL types in an archive entry */ __LA_DECL int archive_entry_acl_types(struct archive_entry *); Modified: head/contrib/libarchive/libarchive/archive_entry_locale.h ============================================================================== --- head/contrib/libarchive/libarchive/archive_entry_locale.h Fri Dec 30 23:00:00 2016 (r310869) +++ head/contrib/libarchive/libarchive/archive_entry_locale.h Fri Dec 30 23:05:06 2016 (r310870) @@ -63,8 +63,7 @@ int _archive_entry_uname_l(struct archiv 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 *) -__attribute__ ((deprecated)); +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 *);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612302305.uBUN5640047755>