summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMake/Platforms/WindowsCache.cmake1
-rw-r--r--CMakeLists.txt1
-rw-r--r--lib/asyn-ares.c4
-rw-r--r--lib/asyn-thread.c10
-rw-r--r--lib/config-dos.h1
-rw-r--r--lib/config-win32.h5
-rw-r--r--lib/config-win32ce.h3
-rw-r--r--lib/curl_config.h.cmake3
-rw-r--r--lib/curl_threads.c4
-rw-r--r--lib/hostasyn.c4
-rw-r--r--lib/hostip.c4
-rw-r--r--lib/hostip4.c4
-rw-r--r--lib/hostip6.c4
-rw-r--r--lib/hostsyn.c4
-rw-r--r--lib/smb.c7
-rw-r--r--lib/vtls/mbedtls_threadlock.c13
-rw-r--r--lib/vtls/mbedtls_threadlock.h2
17 files changed, 11 insertions, 63 deletions
diff --git a/CMake/Platforms/WindowsCache.cmake b/CMake/Platforms/WindowsCache.cmake
index 9a513bb6c..3bcfcd1ee 100644
--- a/CMake/Platforms/WindowsCache.cmake
+++ b/CMake/Platforms/WindowsCache.cmake
@@ -34,7 +34,6 @@ if(NOT UNIX)
set(HAVE_NETDB_H 0)
set(HAVE_NETINET_IN_H 0)
set(HAVE_NET_IF_H 0)
- set(HAVE_PROCESS_H 1)
set(HAVE_PWD_H 0)
set(HAVE_SETJMP_H 1)
set(HAVE_SIGNAL_H 1)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 671454309..6719c872a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1006,7 +1006,6 @@ check_include_file_concat("time.h" HAVE_TIME_H)
check_include_file_concat("unistd.h" HAVE_UNISTD_H)
check_include_file_concat("utime.h" HAVE_UTIME_H)
-check_include_file_concat("process.h" HAVE_PROCESS_H)
check_include_file_concat("stddef.h" HAVE_STDDEF_H)
check_include_file_concat("stdint.h" HAVE_STDINT_H)
check_include_file_concat("sys/utsname.h" HAVE_SYS_UTSNAME_H)
diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c
index 33edba139..993222b83 100644
--- a/lib/asyn-ares.c
+++ b/lib/asyn-ares.c
@@ -47,10 +47,6 @@
#include <inet.h>
#endif
-#ifdef HAVE_PROCESS_H
-#include <process.h>
-#endif
-
#if (defined(NETWARE) && defined(__NOVELL_LIBC__))
#undef in_addr_t
#define in_addr_t unsigned long
diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
index e121c516f..283629e84 100644
--- a/lib/asyn-thread.c
+++ b/lib/asyn-thread.c
@@ -44,14 +44,8 @@
#include <inet.h>
#endif
-#if defined(USE_THREADS_POSIX)
-# ifdef HAVE_PTHREAD_H
-# include <pthread.h>
-# endif
-#elif defined(USE_THREADS_WIN32)
-# ifdef HAVE_PROCESS_H
-# include <process.h>
-# endif
+#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
+# include <pthread.h>
#endif
#if (defined(NETWARE) && defined(__NOVELL_LIBC__))
diff --git a/lib/config-dos.h b/lib/config-dos.h
index 8e3c940d9..34e8c5f51 100644
--- a/lib/config-dos.h
+++ b/lib/config-dos.h
@@ -56,7 +56,6 @@
#define HAVE_NETINET_IN_H 1
#define HAVE_NETINET_TCP_H 1
#define HAVE_NET_IF_H 1
-#define HAVE_PROCESS_H 1
#define HAVE_RECV 1
#define HAVE_SELECT 1
#define HAVE_SEND 1
diff --git a/lib/config-win32.h b/lib/config-win32.h
index 00e8663d2..283738022 100644
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -66,11 +66,6 @@
/* Define if you have the <netinet/in.h> header file. */
/* #define HAVE_NETINET_IN_H 1 */
-/* Define if you have the <process.h> header file. */
-#ifndef __SALFORDC__
-#define HAVE_PROCESS_H 1
-#endif
-
/* Define if you have the <signal.h> header file. */
#define HAVE_SIGNAL_H 1
diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h
index 308bfe9e0..e702a0c32 100644
--- a/lib/config-win32ce.h
+++ b/lib/config-win32ce.h
@@ -65,9 +65,6 @@
/* Define if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
-/* Define if you have the <process.h> header file. */
-/* #define HAVE_PROCESS_H 1 */
-
/* Define if you have the <sys/param.h> header file. */
/* #define HAVE_SYS_PARAM_H 1 */
diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index 2ce4a43c0..e12d48901 100644
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -595,9 +595,6 @@
/* Define to 1 if you have the ws2tcpip.h header file. */
#cmakedefine HAVE_WS2TCPIP_H 1
-/* Define if you have the <process.h> header file. */
-#cmakedefine HAVE_PROCESS_H 1
-
/* Define to 1 if you need the lber.h header file even with ldap.h */
#cmakedefine NEED_LBER_H 1
diff --git a/lib/curl_threads.c b/lib/curl_threads.c
index eb8e13608..dff61676c 100644
--- a/lib/curl_threads.c
+++ b/lib/curl_threads.c
@@ -31,9 +31,7 @@
# include <pthread.h>
# endif
#elif defined(USE_THREADS_WIN32)
-# ifdef HAVE_PROCESS_H
-# include <process.h>
-# endif
+# include <process.h>
#endif
#include "curl_threads.h"
diff --git a/lib/hostasyn.c b/lib/hostasyn.c
index 0bfbe2ef8..df50d13e1 100644
--- a/lib/hostasyn.c
+++ b/lib/hostasyn.c
@@ -43,10 +43,6 @@
#include <inet.h>
#endif
-#ifdef HAVE_PROCESS_H
-#include <process.h>
-#endif
-
#include "urldata.h"
#include "sendf.h"
#include "hostip.h"
diff --git a/lib/hostip.c b/lib/hostip.c
index 941ecacf4..dd427a2c6 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -48,10 +48,6 @@
#include <signal.h>
#endif
-#ifdef HAVE_PROCESS_H
-#include <process.h>
-#endif
-
#include "urldata.h"
#include "sendf.h"
#include "hostip.h"
diff --git a/lib/hostip4.c b/lib/hostip4.c
index 1dd54e879..b0280cd09 100644
--- a/lib/hostip4.c
+++ b/lib/hostip4.c
@@ -43,10 +43,6 @@
#include <inet.h>
#endif
-#ifdef HAVE_PROCESS_H
-#include <process.h>
-#endif
-
#include "urldata.h"
#include "sendf.h"
#include "hostip.h"
diff --git a/lib/hostip6.c b/lib/hostip6.c
index c62c254c7..af8bc2302 100644
--- a/lib/hostip6.c
+++ b/lib/hostip6.c
@@ -43,10 +43,6 @@
#include <inet.h>
#endif
-#ifdef HAVE_PROCESS_H
-#include <process.h>
-#endif
-
#include "urldata.h"
#include "sendf.h"
#include "hostip.h"
diff --git a/lib/hostsyn.c b/lib/hostsyn.c
index ee54363bf..73d1e5056 100644
--- a/lib/hostsyn.c
+++ b/lib/hostsyn.c
@@ -43,10 +43,6 @@
#include <inet.h>
#endif
-#ifdef HAVE_PROCESS_H
-#include <process.h>
-#endif
-
#include "urldata.h"
#include "sendf.h"
#include "hostip.h"
diff --git a/lib/smb.c b/lib/smb.c
index a62e85814..b347f1b74 100644
--- a/lib/smb.c
+++ b/lib/smb.c
@@ -30,13 +30,8 @@
#define BUILDING_CURL_SMB_C
-#ifdef HAVE_PROCESS_H
-#include <process.h>
-#ifdef CURL_WINDOWS_APP
+#ifdef WIN32
#define getpid GetCurrentProcessId
-#elif defined(WIN32)
-#define getpid _getpid
-#endif
#endif
#include "smb.h"
diff --git a/lib/vtls/mbedtls_threadlock.c b/lib/vtls/mbedtls_threadlock.c
index 3971e69b2..7d019ede5 100644
--- a/lib/vtls/mbedtls_threadlock.c
+++ b/lib/vtls/mbedtls_threadlock.c
@@ -26,13 +26,12 @@
#if defined(USE_MBEDTLS) && \
((defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)) || \
- (defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)))
+ defined(USE_THREADS_WIN32))
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
# include <pthread.h>
# define MBEDTLS_MUTEX_T pthread_mutex_t
-#elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)
-# include <process.h>
+#elif defined(USE_THREADS_WIN32)
# define MBEDTLS_MUTEX_T HANDLE
#endif
@@ -60,7 +59,7 @@ int Curl_mbedtlsthreadlock_thread_setup(void)
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
if(pthread_mutex_init(&mutex_buf[i], NULL))
return 0; /* pthread_mutex_init failed */
-#elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)
+#elif defined(USE_THREADS_WIN32)
mutex_buf[i] = CreateMutex(0, FALSE, 0);
if(mutex_buf[i] == 0)
return 0; /* CreateMutex failed */
@@ -81,7 +80,7 @@ int Curl_mbedtlsthreadlock_thread_cleanup(void)
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
if(pthread_mutex_destroy(&mutex_buf[i]))
return 0; /* pthread_mutex_destroy failed */
-#elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)
+#elif defined(USE_THREADS_WIN32)
if(!CloseHandle(mutex_buf[i]))
return 0; /* CloseHandle failed */
#endif /* USE_THREADS_POSIX && HAVE_PTHREAD_H */
@@ -101,7 +100,7 @@ int Curl_mbedtlsthreadlock_lock_function(int n)
"Error: mbedtlsthreadlock_lock_function failed\n"));
return 0; /* pthread_mutex_lock failed */
}
-#elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)
+#elif defined(USE_THREADS_WIN32)
if(WaitForSingleObject(mutex_buf[n], INFINITE) == WAIT_FAILED) {
DEBUGF(fprintf(stderr,
"Error: mbedtlsthreadlock_lock_function failed\n"));
@@ -121,7 +120,7 @@ int Curl_mbedtlsthreadlock_unlock_function(int n)
"Error: mbedtlsthreadlock_unlock_function failed\n"));
return 0; /* pthread_mutex_unlock failed */
}
-#elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)
+#elif defined(USE_THREADS_WIN32)
if(!ReleaseMutex(mutex_buf[n])) {
DEBUGF(fprintf(stderr,
"Error: mbedtlsthreadlock_unlock_function failed\n"));
diff --git a/lib/vtls/mbedtls_threadlock.h b/lib/vtls/mbedtls_threadlock.h
index 3a50d0381..22e8725ab 100644
--- a/lib/vtls/mbedtls_threadlock.h
+++ b/lib/vtls/mbedtls_threadlock.h
@@ -29,7 +29,7 @@
#ifdef USE_MBEDTLS
#if (defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)) || \
- (defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H))
+ defined(USE_THREADS_WIN32)
int Curl_mbedtlsthreadlock_thread_setup(void);
int Curl_mbedtlsthreadlock_thread_cleanup(void);
View Lorry Controller Status