diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-10-28 22:30:42 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-03-25 16:12:46 -0400 |
| commit | 663b9ff6af97bc86d1b92be0d7e1ed8185852426 (patch) | |
| tree | eea3d69b09bcab3ef57cc150e05bd65fa4b4b747 | |
| parent | e9c667af96278d277eb2a20a6d8364d21464c3eb (diff) | |
DRTVWR-476: pthread_self() also needs CRYPTO_THREADID_set_pointer()
| -rw-r--r-- | indra/llcorehttp/examples/http_texture_load.cpp | 2 | ||||
| -rwxr-xr-x | indra/llcorehttp/tests/llcorehttp_test.cpp | 2 | ||||
| -rw-r--r-- | indra/llcrashlogger/llcrashlogger.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcorehttp/examples/http_texture_load.cpp b/indra/llcorehttp/examples/http_texture_load.cpp index f80e64c965..c7376042b3 100644 --- a/indra/llcorehttp/examples/http_texture_load.cpp +++ b/indra/llcorehttp/examples/http_texture_load.cpp @@ -645,7 +645,7 @@ void ssl_thread_id_callback(CRYPTO_THREADID* pthreadid) #if defined(WIN32) CRYPTO_THREADID_set_pointer(pthreadid, GetCurrentThread()); #else - CRYPTO_THREADID_set_numeric(pthreadid, pthread_self()); + CRYPTO_THREADID_set_pointer(pthreadid, pthread_self()); #endif } diff --git a/indra/llcorehttp/tests/llcorehttp_test.cpp b/indra/llcorehttp/tests/llcorehttp_test.cpp index d2df15ed5f..cf4dff877a 100755 --- a/indra/llcorehttp/tests/llcorehttp_test.cpp +++ b/indra/llcorehttp/tests/llcorehttp_test.cpp @@ -118,7 +118,7 @@ void ssl_thread_id_callback(CRYPTO_THREADID* pthreadid) #if defined(WIN32) CRYPTO_THREADID_set_pointer(pthreadid, GetCurrentThread()); #else - CRYPTO_THREADID_set_numeric(pthreadid, pthread_self()); + CRYPTO_THREADID_set_pointer(pthreadid, pthread_self()); #endif } diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index be7a08ac41..58a5df21dd 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_numeric(pthreadid, pthread_self()); + CRYPTO_THREADID_set_pointer(pthreadid, pthread_self()); #endif } |