diff options
| author | fanquake <fanquake@gmail.com> | 2022-09-14 09:30:07 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-09-14 09:33:34 +0100 |
| commit | a10df7cf351e3947ba2d6cd1357d2c3348f8559a (patch) | |
| tree | d7c72283419332db94f038757728e28db5ab0ba6 | |
| parent | 13fd9ee5c2d747e9f74d3fd8e33a4f0c9eaa769c (diff) | |
build: prune BOOST_CPPFLAGS from libbitcoin_zmq
Rather than including validation.h, which ultimately means needing boost
via txmempool.h, include primitives/block.h for CBlock, and remove
validation.h, as we can get cs_main from node/blockstorage.h.
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/zmq/zmqnotificationinterface.cpp | 2 | ||||
| -rw-r--r-- | src/zmq/zmqpublishnotifier.cpp | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d5500b08a2..f9a42598e4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -439,7 +439,7 @@ libbitcoin_node_a_SOURCES += dummywallet.cpp endif if ENABLE_ZMQ -libbitcoin_zmq_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) $(ZMQ_CFLAGS) +libbitcoin_zmq_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(ZMQ_CFLAGS) libbitcoin_zmq_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libbitcoin_zmq_a_SOURCES = \ zmq/zmqabstractnotifier.cpp \ diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp index 26618735f6..b9b7019a3c 100644 --- a/src/zmq/zmqnotificationinterface.cpp +++ b/src/zmq/zmqnotificationinterface.cpp @@ -8,7 +8,7 @@ #include <zmq.h> -#include <validation.h> +#include <primitives/block.h> #include <util/system.h> CZMQNotificationInterface::CZMQNotificationInterface() : pcontext(nullptr) diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp index 011336bf72..51c8ad515e 100644 --- a/src/zmq/zmqpublishnotifier.cpp +++ b/src/zmq/zmqpublishnotifier.cpp @@ -11,7 +11,6 @@ #include <rpc/server.h> #include <streams.h> #include <util/system.h> -#include <validation.h> // For cs_main #include <zmq/zmqutil.h> #include <zmq.h> |