Permalink
Browse files

Merge #8004: signal handling: fReopenDebugLog and fRequestShutdown sh…

…ould be type sig_atomic_t

3262316 fReopenDebugLog and fRequestShutdown should be type sig_atomic_t (Chirag Davé)
  • Loading branch information...
laanwj committed May 12, 2016
2 parents 5b736dd + 3262316 commit 2efe38b8323c77d259bbf87280c5e5e634f3f475
Showing with 7 additions and 3 deletions.
  1. +1 −1 src/init.cpp
  2. +1 −1 src/util.cpp
  3. +5 −1 src/util.h
View
@@ -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
@@ -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
@@ -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;

0 comments on commit 2efe38b

Please sign in to comment.