Skip to content

Commit a10df7c

Browse files
committed
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.
1 parent 13fd9ee commit a10df7c

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

src/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ libbitcoin_node_a_SOURCES += dummywallet.cpp
439439
endif
440440

441441
if ENABLE_ZMQ
442-
libbitcoin_zmq_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) $(ZMQ_CFLAGS)
442+
libbitcoin_zmq_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(ZMQ_CFLAGS)
443443
libbitcoin_zmq_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
444444
libbitcoin_zmq_a_SOURCES = \
445445
zmq/zmqabstractnotifier.cpp \

src/zmq/zmqnotificationinterface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include <zmq.h>
1010

11-
#include <validation.h>
11+
#include <primitives/block.h>
1212
#include <util/system.h>
1313

1414
CZMQNotificationInterface::CZMQNotificationInterface() : pcontext(nullptr)

src/zmq/zmqpublishnotifier.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <rpc/server.h>
1212
#include <streams.h>
1313
#include <util/system.h>
14-
#include <validation.h> // For cs_main
1514
#include <zmq/zmqutil.h>
1615

1716
#include <zmq.h>

0 commit comments

Comments
 (0)