diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-20 13:10:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-02-23 12:15:20 (GMT) |
| commit | ae4861ec2214cb025f8bf2426376a4aca9809d73 (patch) | |
| tree | 792605fe8c06b4ff9851ea563103e6f2ddd6f084 | |
| parent | fecb70dd34b5ba244263e72c42f90701775e132f (diff) | |
| download | CMake-ae4861ec2214cb025f8bf2426376a4aca9809d73.zip CMake-ae4861ec2214cb025f8bf2426376a4aca9809d73.tar.gz CMake-ae4861ec2214cb025f8bf2426376a4aca9809d73.tar.bz2 | |
libarchive: Define __LA_DEPRECATED consistently
Upstream libarchive now defines this macro in two places with the same
logic in both. However, CMake's bundled copy disables this macro, so
we need to update the new location of its definition to be consistent.
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_entry.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_entry.h b/Utilities/cmlibarchive/libarchive/archive_entry.h index 9427413..fe86ee3 100644 --- a/Utilities/cmlibarchive/libarchive/archive_entry.h +++ b/Utilities/cmlibarchive/libarchive/archive_entry.h @@ -105,11 +105,8 @@ 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 +/* CMake uses some deprecated APIs to build with old libarchive versions. */ +#define __LA_DEPRECATED #ifdef __cplusplus extern "C" { |