X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=engines%2Fe_aep.c;h=1953f0643c3aaf68023a166ddd875294bfb40980;hb=0c4b72e9c0e3a75e0b89166540396dc3b58138b8;hp=742b4f9b186dea01a64567568781fa4dec93aecb;hpb=e527201f6be3c295358bcc8b6bafec598f02dc97;p=oweals%2Fopenssl.git diff --git a/engines/e_aep.c b/engines/e_aep.c index 742b4f9b18..1953f0643c 100644 --- a/engines/e_aep.c +++ b/engines/e_aep.c @@ -68,6 +68,8 @@ typedef int pid_t; #if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB) #define getpid GetThreadID extern int GetThreadID(void); +#elif defined(_WIN32) && !defined(__WATCOMC__) +#define getpid _getpid #endif #include @@ -83,7 +85,6 @@ extern int GetThreadID(void); #ifndef OPENSSL_NO_DH #include #endif -#include #ifndef OPENSSL_NO_HW #ifndef OPENSSL_NO_HW_AEP @@ -867,13 +868,7 @@ static AEP_RV aep_get_connection(AEP_CONNECTION_HNDL_PTR phConnection) CRYPTO_w_lock(CRYPTO_LOCK_ENGINE); -#ifdef NETWARE_CLIB - curr_pid = GetThreadID(); -#elif defined(_WIN32) - curr_pid = _getpid(); -#else curr_pid = getpid(); -#endif /*Check if this is the first time this is being called from the current process*/