diff options
| author | Nicky <sl.nicky.ml@googlemail.com> | 2019-06-06 20:59:01 +0200 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-03-25 18:40:45 -0400 |
| commit | 69de6ece31c4bfc65edc6033c4a6d76477defde9 (patch) | |
| tree | 41f7908d575d708c4c6dad594bd3c9da437c6a0d /indra | |
| parent | 690909716bfb2e2cae3bf9c18f6ec37d3ece086e (diff) | |
Use reinterpret_cast to pass pthread_self (pthread_t) into CRYPTO_THREADID_set_pointer (void*).
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcrashlogger/llcrashlogger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 } |