From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 18 Nov 2010 22:59:53 +0000 (+0000)
Subject: PR: 2375
X-Git-Tag: OpenSSL_1_0_1-beta1~430
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eef2fa00d96d952b6ed9244693474b826ae9f722;p=oweals%2Fopenssl.git

PR: 2375
Submitted by: Guenter <lists@gknw.net>
Reviewed by: steve

cleanup/fix e_aep.c for OpenWatcom
---

diff --git a/engines/e_aep.c b/engines/e_aep.c
index 742b4f9b18..d7f89e5156 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 <openssl/crypto.h>
@@ -867,13 +869,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*/