pid_t probe for Windows.

SVN-Revision: 1824

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af0a7f23e8f66fada33355c92f83c0fa0c81aec7..42dc9fee555eb84ee6291d4b84ff54c398de6a74 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -580,6 +580,15 @@ IF(NOT HAVE_UID_T)
   ENDIF(WIN32)
 ENDIF(NOT HAVE_UID_T)
 #
+CHECK_TYPE_SIZE(pid_t       PID_T)
+IF(NOT HAVE_PID_T)
+  IF(WIN32)
+    SET(pid_t "int")
+  ELSE(WIN32)
+    MESSAGE(FATAL_ERROR "pid_t doesn't exist on this platform?")
+  ENDIF(WIN32)
+ENDIF(NOT HAVE_PID_T)
+#
 CHECK_TYPE_SIZE(uint16_t    UINT16_T)
 IF(NOT HAVE_UINT16_T)
   SET(uint16_t "unsigned short")

diff --git a/build/cmake/config.h.in b/build/cmake/config.h.in
index 85137407ed6b5832a25567607a91bcf753d2ed10..2d2a000e4007bc5b8fd759315ead85442deb860b 100644 (file)
--- a/build/cmake/config.h.in
+++ b/build/cmake/config.h.in
@@ -690,6 +690,9 @@
 /* Define to `long long' if <sys/types.h> does not define. */
 #cmakedefine off_t ${off_t}
 
+/* Define to `int' if <sys/types.h> doesn't define. */
+#cmakedefine pid_t ${pid_t}
+
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 #cmakedefine size_t ${size_t}
 

diff --git a/libarchive/archive_windows.h b/libarchive/archive_windows.h
index 62fccf42dc5174e3483d88a99d1c38b127d518f3..b68e72e9870fbbd01e1159b9568965e74bc63ee4 100644 (file)
--- a/libarchive/archive_windows.h
+++ b/libarchive/archive_windows.h
@@ -302,8 +302,6 @@ struct _timeval64i32 {
 #define __timeval _timeval64i32
 #endif
 
-typedef int pid_t;
-
 /* Message digest define */
 #if !defined(HAVE_OPENSSL_MD5_H) && !defined(HAVE_OPENSSL_SHA_H)
 # if defined(_MSC_VER) && _MSC_VER < 1300