projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update NEWS
[oweals/openssl.git]
/
engines
/
e_aep.c
diff --git
a/engines/e_aep.c
b/engines/e_aep.c
index 742b4f9b186dea01a64567568781fa4dec93aecb..1953f0643c3aaf68023a166ddd875294bfb40980 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>
@@
-83,7
+85,6
@@
extern int GetThreadID(void);
#ifndef OPENSSL_NO_DH
#include <openssl/dh.h>
#endif
#ifndef OPENSSL_NO_DH
#include <openssl/dh.h>
#endif
-#include <openssl/bn.h>
#ifndef OPENSSL_NO_HW
#ifndef OPENSSL_NO_HW_AEP
#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);
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*/