diff options
| author | fanquake <fanquake@gmail.com> | 2023-05-22 09:59:20 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-05-22 10:00:15 +0100 |
| commit | a106a86c46ce9dca7cbe0644e702c05fc680387f (patch) | |
| tree | b85eb66d489edfe16374e0dffccbf4948a0d084c /build_msvc/bitcoin_config.h.in | |
| parent | f998eb766227d55a7a6da876971fd2a28374eee8 (diff) | |
| parent | fa5831bd6f940c4afb43ff625ba4fa6c641e999a (diff) | |
| download | bitcoin-a106a86c46ce9dca7cbe0644e702c05fc680387f.tar.xz | |
Merge bitcoin/bitcoin#27696: build: Do not define `ENABLE_ZMQ` when ZMQ is not available
fa5831bd6f940c4afb43ff625ba4fa6c641e999a build: Do not define `ENABLE_ZMQ` when ZMQ is not available (Hennadii Stepanov)
Pull request description:
A new behavior is consistent with the other optional dependencies.
The source code contains `#if ENABLE_ZMQ` lines only:
```
$ git grep ENABLE_ZMQ -- src/*.cpp
src/init.cpp:#if ENABLE_ZMQ
src/init.cpp:#if ENABLE_ZMQ
src/init.cpp:#if ENABLE_ZMQ
src/init.cpp:#if ENABLE_ZMQ
src/init.cpp:#if ENABLE_ZMQ
```
Change in description line -- "Define to 1..." --> "Define this symbol.." -- is motivated by the fact that the actual value of the defined `ENABLE_ZMQ` macro does not matter at all.
Related to:
- https://github.com/bitcoin/bitcoin/issues/16419
- https://github.com/bitcoin/bitcoin/pull/25302
ACKs for top commit:
TheCharlatan:
ACK fa5831bd6f940c4afb43ff625ba4fa6c641e999a
jarolrod:
ACK fa5831bd6f940c4afb43ff625ba4fa6c641e999a
Tree-SHA512: 5e72ff0d34c4b33205338daea0aae8d7aa0e48fd633e21af01af32b7ddb0532ef68dd3dd74deb2c1d2599691929617e8c09676bcbaaf7d669b88816f866f1db2
Diffstat (limited to 'build_msvc/bitcoin_config.h.in')
| -rw-r--r-- | build_msvc/bitcoin_config.h.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_msvc/bitcoin_config.h.in b/build_msvc/bitcoin_config.h.in index 05e38b1571..1716647486 100644 --- a/build_msvc/bitcoin_config.h.in +++ b/build_msvc/bitcoin_config.h.in @@ -38,7 +38,7 @@ /* Define to 1 to enable SQLite wallet */ #define USE_SQLITE 1 -/* Define to 1 to enable ZMQ functions */ +/* Define this symbol to enable ZMQ functions */ #define ENABLE_ZMQ 1 /* define if external signer support is enabled (requires Boost::Process) */ |