Merge #8004: signal handling: fReopenDebugLog and fRequestShutdown should be type sig_atomic_t

3262316 fReopenDebugLog and fRequestShutdown should be type sig_atomic_t (Chirag Davé)
This commit is contained in:
Wladimir J. van der Laan 2016-05-12 11:45:49 +02:00
commit 2efe38b832
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
3 changed files with 7 additions and 3 deletions

View File

@ -123,7 +123,7 @@ static const char* FEE_ESTIMATES_FILENAME="fee_estimates.dat";
// shutdown thing.
//
volatile bool fRequestShutdown = false;
volatile sig_atomic_t fRequestShutdown = false;
void StartShutdown()
{

View File

@ -113,7 +113,7 @@ string strMiscWarning;
bool fLogTimestamps = DEFAULT_LOGTIMESTAMPS;
bool fLogTimeMicros = DEFAULT_LOGTIMEMICROS;
bool fLogIPs = DEFAULT_LOGIPS;
volatile bool fReopenDebugLog = false;
volatile sig_atomic_t fReopenDebugLog = false;
CTranslationInterface translationInterface;
/** Init OpenSSL library multithreading support */

View File

@ -28,6 +28,10 @@
#include <boost/signals2/signal.hpp>
#include <boost/thread/exceptions.hpp>
#ifndef WIN32
#include <signal.h>
#endif
static const bool DEFAULT_LOGTIMEMICROS = false;
static const bool DEFAULT_LOGIPS = false;
static const bool DEFAULT_LOGTIMESTAMPS = true;
@ -50,7 +54,7 @@ extern std::string strMiscWarning;
extern bool fLogTimestamps;
extern bool fLogTimeMicros;
extern bool fLogIPs;
extern volatile bool fReopenDebugLog;
extern volatile sig_atomic_t fReopenDebugLog;
extern CTranslationInterface translationInterface;
extern const char * const BITCOIN_CONF_FILENAME;