diff options
author | LibArchive Upstream <libarchive-discuss@googlegroups.com> | 2017-02-25 11:31:44 -0800 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2017-02-27 08:47:35 -0500 |
commit | 059aa805c9c0cb34c92eb69abf66febc40ab62db (patch) | |
tree | 8e1b818df2e087c061b83a35f8232922b5fd597a /libarchive/archive_entry.h | |
parent | c206211af647dd1f7039da91c34c9c72e50aefdf (diff) | |
download | cmake-059aa805c9c0cb34c92eb69abf66febc40ab62db.tar.gz |
LibArchive 2017-02-25 (d6b1bb9f)
Code extracted from:
https://github.com/libarchive/libarchive.git
at commit d6b1bb9f7ea7bc153b7356e8e345c9e48005821a (v3.3.1).
Diffstat (limited to 'libarchive/archive_entry.h')
-rw-r--r-- | libarchive/archive_entry.h | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/libarchive/archive_entry.h b/libarchive/archive_entry.h index 2dd557aa33..7645f0cf60 100644 --- a/libarchive/archive_entry.h +++ b/libarchive/archive_entry.h @@ -30,7 +30,7 @@ #define ARCHIVE_ENTRY_H_INCLUDED /* Note: Compiler will complain if this does not match archive.h! */ -#define ARCHIVE_VERSION_NUMBER 3003000 +#define ARCHIVE_VERSION_NUMBER 3003001 /* * Note: archive_entry.h is for use outside of libarchive; the @@ -66,6 +66,27 @@ typedef int64_t la_int64_t; # endif #endif +/* The la_ssize_t should match the type used in 'struct stat' */ +#if !defined(__LA_SSIZE_T_DEFINED) +/* Older code relied on the __LA_SSIZE_T macro; after 4.0 we'll switch to the typedef exclusively. */ +# if ARCHIVE_VERSION_NUMBER < 4000000 +#define __LA_SSIZE_T la_ssize_t +# endif +#define __LA_SSIZE_T_DEFINED +# if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__) +# if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_) +typedef ssize_t la_ssize_t; +# elif defined(_WIN64) +typedef __int64 la_ssize_t; +# else +typedef long la_ssize_t; +# endif +# else +# include <unistd.h> /* ssize_t */ +typedef ssize_t la_ssize_t; +# endif +#endif + /* Get a suitable definition for mode_t */ #if ARCHIVE_VERSION_NUMBER >= 3999000 /* Switch to plain 'int' for libarchive 4.0. It's less broken than 'mode_t' */ @@ -526,9 +547,9 @@ __LA_DECL int archive_entry_acl_next_w(struct archive_entry *, int /* want_type #define ARCHIVE_ENTRY_ACL_STYLE_COMPACT 0x00000010 __LA_DECL wchar_t *archive_entry_acl_to_text_w(struct archive_entry *, - ssize_t * /* len */, int /* flags */); + la_ssize_t * /* len */, int /* flags */); __LA_DECL char *archive_entry_acl_to_text(struct archive_entry *, - ssize_t * /* len */, int /* flags */); + la_ssize_t * /* len */, int /* flags */); __LA_DECL int archive_entry_acl_from_text_w(struct archive_entry *, const wchar_t * /* wtext */, int /* type */); __LA_DECL int archive_entry_acl_from_text(struct archive_entry *, |