X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=engines%2Fe_aep.c;h=1953f0643c3aaf68023a166ddd875294bfb40980;hb=0c4b72e9c0e3a75e0b89166540396dc3b58138b8;hp=ffdc354cdcf99053845c4f3efa1545185ede8825;hpb=eef0c1f34c7b7d6a38e02f3294eb509aef081749;p=oweals%2Fopenssl.git

diff --git a/engines/e_aep.c b/engines/e_aep.c
index ffdc354cdc..1953f0643c 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,11 +868,7 @@ static AEP_RV aep_get_connection(AEP_CONNECTION_HNDL_PTR phConnection)
 
 	CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
 
-#ifndef NETWARE_CLIB
 	curr_pid = getpid();
-#else
-	curr_pid = GetThreadID();
-#endif
 
 	/*Check if this is the first time this is being called from the current
 	  process*/