Skip to content

Commit 64d2715

Browse files
committed
Merge bitcoin/bitcoin#25053: Guard #include <config/bitcoin-config.h>
88044a1 Guard `#include <config/bitcoin-config.h>` (Hennadii Stepanov) Pull request description: A fix for builds when the `HAVE_CONFIG_H` macro is not defined. ACKs for top commit: Empact: Code Review ACK bitcoin/bitcoin@88044a1 Tree-SHA512: f2bf1693c7671d7113dccaf66ae34a84719d86cb3271fa18b36611deab93a48d787b3ccfbd735d3b763017d709971cb1151d8d7f30390720009e6e2a6275b5b0
2 parents d24318a + 88044a1 commit 64d2715

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/shutdown.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55

66
#include <shutdown.h>
77

8+
#if defined(HAVE_CONFIG_H)
9+
#include <config/bitcoin-config.h>
10+
#endif
11+
812
#include <logging.h>
913
#include <node/ui_interface.h>
1014
#include <util/tokenpipe.h>
1115
#include <warnings.h>
1216

13-
#include <config/bitcoin-config.h>
14-
1517
#include <assert.h>
1618
#include <atomic>
1719
#ifdef WIN32

src/util/tokenpipe.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44
#include <util/tokenpipe.h>
55

6+
#if defined(HAVE_CONFIG_H)
67
#include <config/bitcoin-config.h>
8+
#endif
79

810
#ifndef WIN32
911

0 commit comments

Comments
 (0)