diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-15 18:03:49 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-02-15 18:03:49 (GMT) |
| commit | b3644e460fc8556c24c2a520129a16be04d4f2d4 (patch) | |
| tree | af7fe4511c0183e2a70a8272c116f62e9c62052e /Utilities/cmlibarchive/libarchive/archive_private.h | |
| parent | 406503f62087847c7eb34757ca99087bc511cb92 (diff) | |
| parent | 5d50940288e9158ea3283abe0e85e81872a20f5c (diff) | |
| download | CMake-b3644e460fc8556c24c2a520129a16be04d4f2d4.zip CMake-b3644e460fc8556c24c2a520129a16be04d4f2d4.tar.gz CMake-b3644e460fc8556c24c2a520129a16be04d4f2d4.tar.bz2 | |
Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
LibArchive 2022-02-09 (9147def1)
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_private.h')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_private.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_private.h b/Utilities/cmlibarchive/libarchive/archive_private.h index 937a87b..b2a2cda 100644 --- a/Utilities/cmlibarchive/libarchive/archive_private.h +++ b/Utilities/cmlibarchive/libarchive/archive_private.h @@ -46,6 +46,13 @@ #define __LA_DEAD #endif +#if defined(__GNUC__) && (__GNUC__ > 2 || \ + (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)) +#define __LA_UNUSED __attribute__((__unused__)) +#else +#define __LA_UNUSED +#endif + #define ARCHIVE_WRITE_MAGIC (0xb0c5c0deU) #define ARCHIVE_READ_MAGIC (0xdeb0c5U) #define ARCHIVE_WRITE_DISK_MAGIC (0xc001b0c5U) @@ -100,14 +107,11 @@ struct archive { * Some public API functions depend on the "real" type of the * archive object. */ - struct archive_vtable *vtable; + const struct archive_vtable *vtable; int archive_format; const char *archive_format_name; - int compression_code; /* Currently active compression. */ - const char *compression_name; - /* Number of file entries processed. */ int file_count; |