diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-07-22 23:15:38 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-07-22 23:15:38 +0000 |
| commit | ff4be740b56a733beb5c7978b56c6602fae51a2e (patch) | |
| tree | 2ad1b7b202c6c44c17f499b8cf8c4aa174e62d60 /src/util.cpp | |
| parent | 222ac2b12ab42d7a0ea66cd6fe4e25efa3c31333 (diff) | |
| parent | 4f620dd0f0d0cd9ae1e2bb0403e07bd303e5b3ba (diff) | |
| download | bitcoin-ff4be740b56a733beb5c7978b56c6602fae51a2e.tar.xz | |
Merge branch '0.5.x' into 0.6.0.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 a4424a4632..e6c4ed341a 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -55,7 +55,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) { @@ -71,7 +71,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(); @@ -87,7 +87,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]; |