Merge remote-tracking branch 'zcash/master' into dPoW

2016-10-28 13:50:21 -03:00
parent 78dece340d 1feaefac51
commit 30853e4ab9
137 changed files with 5475 additions and 1453 deletions
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -107,9 +107,10 @@ bool fPrintToDebugLog = true;
 bool fDaemon = false;
 bool fServer = false;
 string strMiscWarning;
-bool fLogTimestamps = false;
-bool fLogIPs = false;
-volatile bool fReopenDebugLog = false;
+bool fLogTimestamps = DEFAULT_LOGTIMESTAMPS;
+bool fLogTimeMicros = DEFAULT_LOGTIMEMICROS;
+bool fLogIPs = DEFAULT_LOGIPS;
+std::atomic<bool> fReopenDebugLog(false);
 CTranslationInterface translationInterface;

 /** Init OpenSSL library multithreading support */