diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-07-22 23:15:22 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-07-22 23:15:22 +0000 |
commit | 4f620dd0f0d0cd9ae1e2bb0403e07bd303e5b3ba (patch) | |
tree | 8dcdd1d39d4ebfd269762fd2e5effb1955672f0c /src/util.cpp | |
parent | b2848bf08a4b6daa67f7fd197aee9f39a08f9b5f (diff) | |
parent | ec9a3c04edc5180e20cb25ecd16558f449fa52e0 (diff) | |
download | bitcoin-4f620dd0f0d0cd9ae1e2bb0403e07bd303e5b3ba.tar.xz |
Merge branch '0.4.x' into 0.5.x
Diffstat (limited to 'src/util.cpp')
-rw-r--r-- | src/util.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/util.cpp b/src/util.cpp index 1f120e18d6..c70b9d9e6e 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -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]; |