mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-06 06:38:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

libarchive: Define __LA_DEPRECATED consistently

Browse Source 
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.
This commit is contained in:
Brad King
2017-02-20 08:10:33 -05:00
parent fecb70dd34
commit ae4861ec22
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Utilities/cmlibarchive/libarchive/archive_entry.h
View File

@@ -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" {