Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'curlthreading2' into curlthreading3

Browse Source
This commit is contained in:
Aleric Inglewood
2012-09-06 15:12:22 +02:00
parent 83b13f6a3f e3752aefed
commit e7cd445491
4070 changed files with 25269 additions and 20661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/aistatemachine/aicurl.cpp
View File

@@ -128,7 +128,7 @@ void ssl_locking_function(int mode, int n, char const* file, int line)
// OpenSSL uniq id function.
void ssl_id_function(CRYPTO_THREADID* thread_id)
{
#if LL_WINDOWS // apr_os_thread_current() returns a pointer,
#if LL_WINDOWS || LL_DARWIN // apr_os_thread_current() returns a pointer,
CRYPTO_THREADID_set_pointer(thread_id, apr_os_thread_current());
#else // else it returns an unsigned long.
CRYPTO_THREADID_set_numeric(thread_id, apr_os_thread_current());