diff options
| author | Brad King <brad.king@kitware.com> | 2009-11-04 21:06:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-11-04 21:06:44 (GMT) |
| commit | e5075bb8e8c358789618bdccc2e4da3a59cf8e0c (patch) | |
| tree | 0d286b72247a52c512ddbb8ee1bf5f549906e8af /Utilities/cmlibarchive/libarchive/archive_entry.h | |
| parent | 7f5361f040b267b3ecbafbbc4f406674ce779f30 (diff) | |
| download | CMake-e5075bb8e8c358789618bdccc2e4da3a59cf8e0c.zip CMake-e5075bb8e8c358789618bdccc2e4da3a59cf8e0c.tar.gz CMake-e5075bb8e8c358789618bdccc2e4da3a59cf8e0c.tar.bz2 | |
libarchive: Fix unconfigured header logic
The commit "libarchive: Fix Borland integer constants" introduced use of
HAVE_* configured macros into archive.h and archive_entry.h where they
are not allowed. This commit replaces the logic with something that
does not depend on the configured macros.
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_entry.h')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_entry.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_entry.h b/Utilities/cmlibarchive/libarchive/archive_entry.h index b1e24c2..01a05af 100644 --- a/Utilities/cmlibarchive/libarchive/archive_entry.h +++ b/Utilities/cmlibarchive/libarchive/archive_entry.h @@ -46,23 +46,22 @@ /* Get appropriate definitions of standard POSIX-style types. */ /* These should match the types used in 'struct stat' */ -#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__BORLANDC__) +#if defined(_WIN32) && !defined(__CYGWIN__) #define __LA_INT64_T __int64 -#define __LA_UID_T short -#define __LA_GID_T short -#define __LA_DEV_T unsigned int -#define __LA_MODE_T unsigned short -#else -#ifdef __BORLANDC__ -# include <sys/types.h> +# if defined(__BORLANDC__) +# define __LA_UID_T uid_t +# define __LA_GID_T gid_t +# define __LA_DEV_T dev_t +# define __LA_MODE_T mode_t +# else +# define __LA_UID_T short +# define __LA_GID_T short +# define __LA_DEV_T unsigned int +# define __LA_MODE_T unsigned short +# endif #else # include <unistd.h> -#endif -#if defined(__BORLANDC__) && !defined(HAVE_SYS_TYPES_H) -#define __LA_INT64_T __int64 -#else #define __LA_INT64_T int64_t -#endif #define __LA_UID_T uid_t #define __LA_GID_T gid_t #define __LA_DEV_T dev_t |