Fix the uid_t and gid_t declarations to match those of VS and MinGW.

SVN-Revision: 1289

diff --git a/libarchive/archive.h b/libarchive/archive.h
index eaefd2c8571ea07ec09f30f2eacd38e8d3fea380..0cae90273ce5bbed88e58bde8a92f2f4d5e6358c 100644 (file)
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -53,8 +53,8 @@
 # else
 #  define      __LA_SSIZE_T    long
 # endif
-#define        __LA_UID_T      short
-#define        __LA_GID_T      short
+#define        __LA_UID_T      unsigned int
+#define        __LA_GID_T      unsigned int
 #else
 #include <unistd.h>  /* 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 54a755bd3a32c3909d3ed72d451dd988974c2eff..52fcc4a39f4b84e6d607e9755dc56b9776536b7e 100644 (file)
--- 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      short
-#define        __LA_GID_T      short
+#define        __LA_UID_T      unsigned int
+#define        __LA_GID_T      unsigned int
 #define        __LA_DEV_T      unsigned int
 #define        __LA_MODE_T     unsigned short
 #else