projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
To support openssl new feature
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
imaging
/
common
/
file-download.cpp
diff --git
a/dali/internal/imaging/common/file-download.cpp
b/dali/internal/imaging/common/file-download.cpp
index
965226d
..
b4d3f4f
100755
(executable)
--- a/
dali/internal/imaging/common/file-download.cpp
+++ b/
dali/internal/imaging/common/file-download.cpp
@@
-22,7
+22,6
@@
#include <dali/integration-api/debug.h>
#include <pthread.h>
#include <curl/curl.h>
#include <dali/integration-api/debug.h>
#include <pthread.h>
#include <curl/curl.h>
-#include <openssl/crypto.h>
#include <cstring>
// INTERNAL INCLUDES
#include <cstring>
// INTERNAL INCLUDES
@@
-250,10
+249,10
@@
void CurlEnvironment::OnOpenSSLLocking( int mode, int n, const char* file, int l
}
}
}
}
-
unsigned long CurlEnvironment::GetThreadId(
)
+
void CurlEnvironment::GetThreadId( CRYPTO_THREADID* tid
)
{
// If dali uses c++ thread, we may replace pthread_self() to this_thread::get_id()
{
// If dali uses c++ thread, we may replace pthread_self() to this_thread::get_id()
-
return static_cast< unsigned long >( pthread_self(
) );
+
CRYPTO_THREADID_set_numeric( tid, static_cast< unsigned long > ( pthread_self()
) );
}
void CurlEnvironment::SetLockingFunction()
}
void CurlEnvironment::SetLockingFunction()
@@
-265,7
+264,7
@@
void CurlEnvironment::SetLockingFunction()
mMutexs = new std::mutex[ CRYPTO_num_locks() ];
mMutexs = new std::mutex[ CRYPTO_num_locks() ];
- CRYPTO_
set_id
_callback( &CurlEnvironment::GetThreadId );
+ CRYPTO_
THREADID_set
_callback( &CurlEnvironment::GetThreadId );
CRYPTO_set_locking_callback( &CurlEnvironment::OnOpenSSLLocking );
}
CRYPTO_set_locking_callback( &CurlEnvironment::OnOpenSSLLocking );
}
@@
-276,7
+275,7
@@
void CurlEnvironment::UnsetLockingFunction()
return;
}
return;
}
- CRYPTO_
set_id
_callback( NULL );
+ CRYPTO_
THREADID_set
_callback( NULL );
CRYPTO_set_locking_callback( NULL );
delete [] mMutexs;
mMutexs = NULL;
CRYPTO_set_locking_callback( NULL );
delete [] mMutexs;
mMutexs = NULL;