Changeset 808 for openssl/trunk/engines/e_aep.c

Timestamp:

Aug 7, 2014, 8:25:37 PM (11 years ago)

Author:

dmik

Message:

openssl: Merge version 1.0.0n from vendor to trunk.

Location:

openssl/trunk

Files:

• . (modified) (1 prop)
• engines/e_aep.c (modified) (2 diffs)

openssl/trunk/engines/e_aep.c ¶

@@ -69 +69 @@
 #define getpid GetThreadID
 extern int GetThreadID(void);
+#elif defined(_WIN32) && !defined(__WATCOMC__)
+#define getpid _getpid
 #endif
 
@@ -868 +870 @@
         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