diff options
| author | Luke Dashjr <[email protected]> | 2012-07-22 23:18:27 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-07-22 23:18:27 +0000 |
| commit | 23cdae18f08f9435b33718ba2fb00c66dc130b80 (patch) | |
| tree | ac70ac92d19b95acb41217feef2f468cd9f1aaad /src/util.cpp | |
| parent | fix for build.h regeneration failure when compiling on Windows (diff) | |
| parent | Merge branch '0.5.x' into 0.6.0.x (diff) | |
| download | discoin-23cdae18f08f9435b33718ba2fb00c66dc130b80.tar.xz discoin-23cdae18f08f9435b33718ba2fb00c66dc130b80.zip | |
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
src/init.cpp
src/util.cpp
Diffstat (limited to 'src/util.cpp')
| -rw-r--r-- | src/util.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/util.cpp b/src/util.cpp index 66d33485f..01c5799b4 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -72,7 +72,7 @@ bool fNoListen = false; bool fLogTimestamps = false; CMedianFilter<int64> vTimeOffsets(200,0); -// 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) { @@ -88,7 +88,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(); @@ -104,7 +104,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]; @@ -1239,7 +1239,7 @@ bool SetStartOnSystemStartup(bool fAutoStart) #else // TODO: OSX startup stuff; see: -// http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPSystemStartup/Articles/CustomLogin.html +// https://developer.apple.com/library/mac/#documentation/MacOSX/Conceptual/BPSystemStartup/Articles/CustomLogin.html bool GetStartOnSystemStartup() { return false; } bool SetStartOnSystemStartup(bool fAutoStart) { return false; } |