From e1932819891c195d459294dbe5862351973edecc Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Sat, 16 Jan 2010 03:57:37 -0500 Subject: [PATCH] pid_t probe for Windows. SVN-Revision: 1824 --- CMakeLists.txt | 9 +++++++++ build/cmake/config.h.in | 3 +++ libarchive/archive_windows.h | 2 -- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index af0a7f23e..42dc9fee5 100644 --- 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 85137407e..2d2a000e4 100644 --- a/build/cmake/config.h.in +++ b/build/cmake/config.h.in @@ -690,6 +690,9 @@ /* Define to `long long' if does not define. */ #cmakedefine off_t ${off_t} +/* Define to `int' if doesn't define. */ +#cmakedefine pid_t ${pid_t} + /* Define to `unsigned int' if does not define. */ #cmakedefine size_t ${size_t} diff --git a/libarchive/archive_windows.h b/libarchive/archive_windows.h index 62fccf42d..b68e72e98 100644 --- 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 -- 2.47.3