From 69de6ece31c4bfc65edc6033c4a6d76477defde9 Mon Sep 17 00:00:00 2001 From: Nicky <sl.nicky.ml@googlemail.com> Date: Thu, 6 Jun 2019 20:59:01 +0200 Subject: Use reinterpret_cast to pass pthread_self (pthread_t) into CRYPTO_THREADID_set_pointer (void*). --- indra/llcrashlogger/llcrashlogger.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcrashlogger/llcrashlogger.cpp') diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index 58a5df21dd..62fcdaf545 100644 --- a/indra/llcrashlogger/llcrashlogger.cpp +++ b/indra/llcrashlogger/llcrashlogger.cpp @@ -663,7 +663,7 @@ void LLCrashLogger::ssl_thread_id_callback(CRYPTO_THREADID* pthreadid) #if LL_WINDOWS CRYPTO_THREADID_set_pointer(pthreadid, GetCurrentThread()); #else - CRYPTO_THREADID_set_pointer(pthreadid, pthread_self()); + CRYPTO_THREADID_set_pointer(pthreadid, reinterpret_cast<void*>(pthread_self())); #endif } -- cgit v1.2.3