diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-07-04 15:26:42 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-07-04 15:34:03 +0200 |
commit | 79e677950b32f31f06f4a72aeb59997bbeae152c (patch) | |
tree | 0116ed5bc15c7ac65ef0eb62f1cac6d8b558df82 /src/index | |
parent | 1756cb4472ada1aed2c0c7a8b0b68edb3b06f9c9 (diff) | |
parent | 1fabd59e7e870fae73bfbcfb227dd7452de94726 (diff) | |
download | bitcoin-79e677950b32f31f06f4a72aeb59997bbeae152c.tar.xz |
Merge #13235: Break circular dependency: init -> * -> init by extracting shutdown.h
1fabd59e7 Break circular dependency: init -> * -> init by extracting shutdown.h (Ben Woosley)
e62fdfeea Drop unused init.h includes (Ben Woosley)
Pull request description:
Most includers just wanted to react to pending shutdown.
This isolates access to `fRequestShutdown` and limits access to the shutdown api functions, including the new `CancelShutdown` for setting it to `false`.
Tree-SHA512: df42f75dfbba163576710e9a67cf1228531fd99d70a2f187bfba0bcc476d6749cf88180a97e66a81bb5b6c3c7f0917de7402d26039ba7b644cb7509b02f7e267
Diffstat (limited to 'src/index')
-rw-r--r-- | src/index/base.cpp | 2 | ||||
-rw-r--r-- | src/index/txindex.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/index/base.cpp b/src/index/base.cpp index 738166dc94..788f7adccd 100644 --- a/src/index/base.cpp +++ b/src/index/base.cpp @@ -4,7 +4,7 @@ #include <chainparams.h> #include <index/base.h> -#include <init.h> +#include <shutdown.h> #include <tinyformat.h> #include <ui_interface.h> #include <util.h> diff --git a/src/index/txindex.cpp b/src/index/txindex.cpp index e106b9b420..c85030e18e 100644 --- a/src/index/txindex.cpp +++ b/src/index/txindex.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include <index/txindex.h> -#include <init.h> +#include <shutdown.h> #include <ui_interface.h> #include <util.h> #include <validation.h> |