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 742b4f9b186dea01a64567568781fa4dec93aecb..d7f89e5156fc5513e6c826de68a27fa2c316f263 100644 (file)
--- 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);
 #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>
 #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);
 
 
        CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
 

-#ifdef NETWARE_CLIB
-       curr_pid = GetThreadID();
-#elif defined(_WIN32)
-       curr_pid = _getpid();
-#else

        curr_pid = getpid();
        curr_pid = getpid();

-#endif

 
        /*Check if this is the first time this is being called from the current
          process*/
 
        /*Check if this is the first time this is being called from the current
          process*/