X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fthr_id.c;h=8de903326f9d6aa6e99c704a87df0cad0ca52b8c;hb=a7a44ba55cb4f884c6bc9ceac90072dea38e66d0;hp=71576dae29431578578384535c7af24fe37f7893;hpb=03e389cf049e4bbc2f6d0028dc320fb0583aad2c;p=oweals%2Fopenssl.git

diff --git a/crypto/thr_id.c b/crypto/thr_id.c
index 71576dae29..8de903326f 100644
--- a/crypto/thr_id.c
+++ b/crypto/thr_id.c
@@ -130,7 +130,6 @@ void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val)
 	id->val = val;
 	}
 
-__fips_constseg
 static const unsigned char hash_coeffs[] = { 3, 5, 7, 11, 13, 17, 19, 23 };
 void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr)
 	{
@@ -200,11 +199,9 @@ void CRYPTO_THREADID_current(CRYPTO_THREADID *id)
 	CRYPTO_THREADID_set_numeric(id, (unsigned long)GetCurrentTask());
 #elif defined(OPENSSL_SYS_WIN32)
 	CRYPTO_THREADID_set_numeric(id, (unsigned long)GetCurrentThreadId());
-#elif defined(OPENSSL_SYS_BEOS)
-	CRYPTO_THREADID_set_numeric(id, (unsigned long)find_thread(NULL));
 #else
 	/* For everything else, default to using the address of 'errno' */
-	CRYPTO_THREADID_set_pointer(id, &errno);
+	CRYPTO_THREADID_set_pointer(id, (void*)&errno);
 #endif
 	}
 
@@ -246,8 +243,6 @@ unsigned long CRYPTO_thread_id(void)
 		ret=(unsigned long)GetCurrentThreadId();
 #elif defined(GETPID_IS_MEANINGLESS)
 		ret=1L;
-#elif defined(OPENSSL_SYS_BEOS)
-		ret=(unsigned long)find_thread(NULL);
 #else
 		ret=(unsigned long)getpid();
 #endif