projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add check for internal error
[openssl.git]
/
crypto
/
cryptlib.c
diff --git
a/crypto/cryptlib.c
b/crypto/cryptlib.c
index d70a570dcee1f72f42943ada2ea6c03989aabd3d..a8f29f1e65c2ac938959920a45d2283ed27e1905 100644
(file)
--- a/
crypto/cryptlib.c
+++ b/
crypto/cryptlib.c
@@
-60,7
+60,6
@@
#include <string.h>
#include "cryptlib.h"
#include <openssl/crypto.h>
#include <string.h>
#include "cryptlib.h"
#include <openssl/crypto.h>
-#include "date.h"
#if defined(WIN32) || defined(WIN16)
static double SSLeay_MSVC5_hack=0.0; /* and for VC1.5 */
#if defined(WIN32) || defined(WIN16)
static double SSLeay_MSVC5_hack=0.0; /* and for VC1.5 */
@@
-93,7
+92,9
@@
static const char* lock_names[CRYPTO_NUM_LOCKS] =
"getservbyname",
"readdir",
"RSA_blinding",
"getservbyname",
"readdir",
"RSA_blinding",
-#if CRYPTO_NUM_LOCKS != 24
+ "dh",
+ "debug_malloc2",
+#if CRYPTO_NUM_LOCKS != 26
# error "Inconsistency between crypto.h and cryptlib.c"
#endif
};
# error "Inconsistency between crypto.h and cryptlib.c"
#endif
};
@@
-182,7
+183,7
@@
unsigned long CRYPTO_thread_id(void)
ret=(unsigned long)GetCurrentTask();
#elif defined(WIN32)
ret=(unsigned long)GetCurrentThreadId();
ret=(unsigned long)GetCurrentTask();
#elif defined(WIN32)
ret=(unsigned long)GetCurrentThreadId();
-#elif defined(
MSDO
S)
+#elif defined(
GETPID_IS_MEANINGLES
S)
ret=1L;
#else
ret=(unsigned long)getpid();
ret=1L;
#else
ret=(unsigned long)getpid();