Skip to content

Commit a688ff9

Browse files
committed
Merge bitcoin/bitcoin#26087: build: prune BOOST_CPPFLAGS from libbitcoin_zmq
a10df7c build: prune BOOST_CPPFLAGS from libbitcoin_zmq (fanquake) Pull request description: 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`. ACKs for top commit: theuni: Nice. ACK a10df7c. hebasto: ACK a10df7c, tested on Linux x86_64 using theuni's [patch](theuni/bitcoin@e131d8f) with depends. Tree-SHA512: 792b6f9e7e7788d10333b4943609efbc798f3b187c324a0f2d5acbb2d44e3c67705dc54d698eb04c23e5af7b8b73a47f8e7974e819eac12f12ae62f28c807476
2 parents 9fefd00 + a10df7c commit a688ff9

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)