X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fcryptlib.c;h=a8f29f1e65c2ac938959920a45d2283ed27e1905;hb=b99b110766b23729f1f123ba68d02788229dedda;hp=356c476a993db3f2511bc2e946a0d6f61639d1b6;hpb=664b99853cbefd2dc9f6ee56631f36b0f63d0d06;p=oweals%2Fopenssl.git diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 356c476a99..a8f29f1e65 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -92,7 +92,9 @@ static const char* lock_names[CRYPTO_NUM_LOCKS] = "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 }; @@ -181,7 +183,7 @@ unsigned long CRYPTO_thread_id(void) ret=(unsigned long)GetCurrentTask(); #elif defined(WIN32) ret=(unsigned long)GetCurrentThreadId(); -#elif defined(MSDOS) +#elif defined(GETPID_IS_MEANINGLESS) ret=1L; #else ret=(unsigned long)getpid();