diff options
Diffstat (limited to 'engines/e_aep.c')
| -rw-r--r-- | engines/e_aep.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/engines/e_aep.c b/engines/e_aep.c index e24e4b424e40..1953f0643c3a 100644 --- a/engines/e_aep.c +++ b/engines/e_aep.c @@ -57,7 +57,7 @@ #include <string.h> #include <openssl/e_os2.h> -#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__) +#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__) || defined(__MINGW32__) #include <sys/types.h> #include <unistd.h> #else @@ -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 <openssl/crypto.h> @@ -83,7 +85,6 @@ extern int GetThreadID(void); #ifndef OPENSSL_NO_DH #include <openssl/dh.h> #endif -#include <openssl/bn.h> #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*/ |