X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fcryptlib.c;h=a8f29f1e65c2ac938959920a45d2283ed27e1905;hb=b99b110766b23729f1f123ba68d02788229dedda;hp=b9586ce1bbc3f4011d0788ae52ad5f000b726065;hpb=13066cee601cb7b2d6980fbb7eba51db4b489ebd;p=oweals%2Fopenssl.git diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index b9586ce1bb..a8f29f1e65 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -93,7 +93,8 @@ static const char* lock_names[CRYPTO_NUM_LOCKS] = "readdir", "RSA_blinding", "dh", -#if CRYPTO_NUM_LOCKS != 25 + "debug_malloc2", +#if CRYPTO_NUM_LOCKS != 26 # 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(); -#elif defined(MSDOS) +#elif defined(GETPID_IS_MEANINGLESS) ret=1L; #else ret=(unsigned long)getpid();