diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2010-11-18 23:00:02 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2010-11-18 23:00:02 +0000 |
commit | 9ac0708f37ed5d06878736af0575a89912966e60 (patch) | |
tree | 4f7b91f3b0f46ca919bb4f6cdc1afb22ea2468c4 | |
parent | 6b02f9fafbeb3801f9c93ea68d809d49df4365d8 (diff) | |
download | openssl-9ac0708f37ed5d06878736af0575a89912966e60.tar.gz |
PR: 2375
Submitted by: Guenter <lists@gknw.net>
Reviewed by: steve
cleanup/fix e_aep.c for OpenWatcom
-rw-r--r-- | engines/e_aep.c | 8 |
1 files changed, 2 insertions, 6 deletions
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*/ |