File tree Expand file tree Collapse file tree 3 files changed +4
-7
lines changed Expand file tree Collapse file tree 3 files changed +4
-7
lines changed Original file line number Diff line number Diff line change @@ -123,7 +123,7 @@ static const char* FEE_ESTIMATES_FILENAME="fee_estimates.dat";
123
123
// shutdown thing.
124
124
//
125
125
126
- volatile sig_atomic_t fRequestShutdown = false ;
126
+ std::atomic< bool > fRequestShutdown ( false ) ;
127
127
128
128
void StartShutdown ()
129
129
{
Original file line number Diff line number Diff line change @@ -113,7 +113,7 @@ string strMiscWarning;
113
113
bool fLogTimestamps = DEFAULT_LOGTIMESTAMPS;
114
114
bool fLogTimeMicros = DEFAULT_LOGTIMEMICROS;
115
115
bool fLogIPs = DEFAULT_LOGIPS;
116
- volatile sig_atomic_t fReopenDebugLog = false ;
116
+ std::atomic< bool > fReopenDebugLog ( false ) ;
117
117
CTranslationInterface translationInterface;
118
118
119
119
/* * Init OpenSSL library multithreading support */
Original file line number Diff line number Diff line change 18
18
#include " tinyformat.h"
19
19
#include " utiltime.h"
20
20
21
+ #include < atomic>
21
22
#include < exception>
22
23
#include < map>
23
24
#include < stdint.h>
28
29
#include < boost/signals2/signal.hpp>
29
30
#include < boost/thread/exceptions.hpp>
30
31
31
- #ifndef WIN32
32
- #include < signal.h>
33
- #endif
34
-
35
32
static const bool DEFAULT_LOGTIMEMICROS = false ;
36
33
static const bool DEFAULT_LOGIPS = false ;
37
34
static const bool DEFAULT_LOGTIMESTAMPS = true ;
@@ -54,7 +51,7 @@ extern std::string strMiscWarning;
54
51
extern bool fLogTimestamps ;
55
52
extern bool fLogTimeMicros ;
56
53
extern bool fLogIPs ;
57
- extern volatile sig_atomic_t fReopenDebugLog ;
54
+ extern std::atomic< bool > fReopenDebugLog ;
58
55
extern CTranslationInterface translationInterface;
59
56
60
57
extern const char * const BITCOIN_CONF_FILENAME;
You can’t perform that action at this time.
0 commit comments