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/Makefile.bench.include | |
| 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/Makefile.bench.include')
| -rw-r--r-- | src/Makefile.bench.include | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include index d70df3c9e8..7b32b72bd1 100644 --- a/src/Makefile.bench.include +++ b/src/Makefile.bench.include @@ -34,8 +34,8 @@ nodist_bench_bench_bitcoin_SOURCES = $(GENERATED_BENCH_FILES) bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/ bench_bench_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) bench_bench_bitcoin_LDADD = \ - $(LIBBITCOIN_SERVER) \ $(LIBBITCOIN_WALLET) \ + $(LIBBITCOIN_SERVER) \ $(LIBBITCOIN_COMMON) \ $(LIBBITCOIN_UTIL) \ $(LIBBITCOIN_CONSENSUS) \ |