From 1e202fe105aa99697430455a089b45b779fece00 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Sun, 2 Aug 2009 15:16:28 -0400 Subject: [PATCH] Revert r1289 and correct some of the *id_t defines: * uid_t/gid_t/id_t all default to "short" on Win32, "unsigned int" elsewhere * pid_t doesn't need to be probed so remove it SVN-Revision: 1306 --- CMakeLists.txt | 21 +++++++++------------ libarchive/archive.h | 4 ++-- libarchive/archive_entry.h | 4 ++-- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 21530a23d..905b82c7d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -381,15 +381,19 @@ ENDIF(NOT HAVE_DEV_T) CHECK_TYPE_SIZE(gid_t GID_T) IF(NOT HAVE_GID_T) IF(WIN32) - SET(gid_t "unsigned int") + SET(gid_t "short") ELSEIF(WIN32) - SET(gid_t int) + SET(gid_t "unsigned int") ENDIF(WIN32) ENDIF(NOT HAVE_GID_T) # CHECK_TYPE_SIZE(id_t ID_T) IF(NOT HAVE_ID_T) - SET(id_t int) + IF(WIN32) + SET(id_t "short") + ELSEIF(WIN32) + SET(id_t "unsigned int") + ENDIF(WIN32) ENDIF(NOT HAVE_ID_T) # CHECK_TYPE_SIZE(int64_t INT64_T) @@ -420,13 +424,6 @@ IF(NOT HAVE_OFF_T) SET(off_t "long long") ENDIF(NOT HAVE_OFF_T) # -CHECK_TYPE_SIZE(pid_t PID_T) -IF(NOT HAVE_PID_T) - IF(MSVC) - SET(pid_t "unsigned short") - ENDIF(MSVC) -ENDIF(NOT HAVE_PID_T) -# CHECK_TYPE_SIZE(size_t SIZE_T) IF(NOT HAVE_SIZE_T) SET(size_t "unsigned int") @@ -448,9 +445,9 @@ ENDIF(NOT HAVE_SSIZE_T) CHECK_TYPE_SIZE(uid_t UID_T) IF(NOT HAVE_UID_T) IF(WIN32) - SET(uid_t "unsigned int") + SET(uid_t "short") ELSEIF(WIN32) - SET(uid_t int) + SET(uid_t "unsigned int") ENDIF(WIN32) ENDIF(NOT HAVE_UID_T) # diff --git a/libarchive/archive.h b/libarchive/archive.h index 0cae90273..6e1ae9925 100644 --- a/libarchive/archive.h +++ b/libarchive/archive.h @@ -53,8 +53,8 @@ # else # define __LA_SSIZE_T long # endif -#define __LA_UID_T unsigned int -#define __LA_GID_T unsigned int +#define __LA_UID_T short +#define __LA_GID_T short #else #include /* ssize_t, uid_t, and gid_t */ #define __LA_INT64_T int64_t diff --git a/libarchive/archive_entry.h b/libarchive/archive_entry.h index 52fcc4a39..54a755bd3 100644 --- a/libarchive/archive_entry.h +++ b/libarchive/archive_entry.h @@ -44,8 +44,8 @@ /* These should match the types used in 'struct stat' */ #if defined(_WIN32) && !defined(__CYGWIN__) #define __LA_INT64_T __int64 -#define __LA_UID_T unsigned int -#define __LA_GID_T unsigned int +#define __LA_UID_T short +#define __LA_GID_T short #define __LA_DEV_T unsigned int #define __LA_MODE_T unsigned short #else -- 2.47.3