Merge branch '0.4.x' into 0.5.x

This commit is contained in:
Luke Dashjr
2012-07-22 23:15:22 +00:00
3 changed files with 8 additions and 6 deletions
+3 -3
View File
@@ -54,7 +54,7 @@ extern "C" void tss_cleanup_implemented() { }
// Init openssl library multithreading support
// Init OpenSSL library multithreading support
static boost::interprocess::interprocess_mutex** ppmutexOpenSSL;
void locking_callback(int mode, int i, const char* file, int line)
{
@@ -70,7 +70,7 @@ class CInit
public:
CInit()
{
// Init openssl library multithreading support
// Init OpenSSL library multithreading support
ppmutexOpenSSL = (boost::interprocess::interprocess_mutex**)OPENSSL_malloc(CRYPTO_num_locks() * sizeof(boost::interprocess::interprocess_mutex*));
for (int i = 0; i < CRYPTO_num_locks(); i++)
ppmutexOpenSSL[i] = new boost::interprocess::interprocess_mutex();
@@ -86,7 +86,7 @@ public:
}
~CInit()
{
// Shutdown openssl library multithreading support
// Shutdown OpenSSL library multithreading support
CRYPTO_set_locking_callback(NULL);
for (int i = 0; i < CRYPTO_num_locks(); i++)
delete ppmutexOpenSSL[i];