github-jwinterm/myriadcoin
1
0
Fork 0
mirror of https://github.com/jwinterm/myriadcoin.git synced 2026-10-19 05:58:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.6.0.x' into 0.6.x

Browse Source 
Conflicts:
	src/init.cpp
	src/util.cpp
This commit is contained in:
Luke Dashjr
2012-07-22 23:18:27 +00:00
parent 339eb29a87 ff4be740b5
commit 23cdae18f0
8 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util.cpp
+4 -4
View File
@@ -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; }