diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 02:28:15 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 02:28:15 +0200 |
| commit | 27e197459da275d2cd8847aa36e6c6bc4720e5c5 (patch) | |
| tree | fccc0ceaac90e03939d37e54cb8519a0132993cf /indra/llcorehttp/httpcommon.cpp | |
| parent | 1a1465dab94a2829cedb4ee4cd0c0169cea0fdeb (diff) | |
| parent | 2ab914a9cdd1ad809879aca05dbf4b624949ecea (diff) | |
Merge
Diffstat (limited to 'indra/llcorehttp/httpcommon.cpp')
| -rw-r--r-- | indra/llcorehttp/httpcommon.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcorehttp/httpcommon.cpp b/indra/llcorehttp/httpcommon.cpp index 1829062af6..7c93c54cdf 100644 --- a/indra/llcorehttp/httpcommon.cpp +++ b/indra/llcorehttp/httpcommon.cpp @@ -333,7 +333,7 @@ LLMutex *getCurlMutex() if (!sHandleMutexp) { - sHandleMutexp = new LLMutex(NULL); + sHandleMutexp = new LLMutex(); } return sHandleMutexp; @@ -389,7 +389,7 @@ void initialize() S32 mutex_count = CRYPTO_num_locks(); for (S32 i = 0; i < mutex_count; i++) { - sSSLMutex.push_back(LLMutex_ptr(new LLMutex(NULL))); + sSSLMutex.push_back(LLMutex_ptr(new LLMutex())); } CRYPTO_set_id_callback(&ssl_thread_id); CRYPTO_set_locking_callback(&ssl_locking_callback); |
