Merge bitcoin/bitcoin#25053: Guard #include <config/bitcoin-config.h>

88044a14d9b2c6c70a3330ee1545a9eb39d14d89 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 88044a14d9

Tree-SHA512: f2bf1693c7671d7113dccaf66ae34a84719d86cb3271fa18b36611deab93a48d787b3ccfbd735d3b763017d709971cb1151d8d7f30390720009e6e2a6275b5b0
This commit is contained in:
fanquake 2022-05-03 09:03:02 +01:00 committed by pasta
parent d50f0b016f
commit 6269c6f1db
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
2 changed files with 6 additions and 2 deletions

View File

@ -5,14 +5,16 @@
#include <shutdown.h>
#if defined(HAVE_CONFIG_H)
#include <config/bitcoin-config.h>
#endif
#include <logging.h>
#include <util/tokenpipe.h>
#include <node/ui_interface.h>
#include <warnings.h>
#include <config/bitcoin-config.h>
#include <assert.h>
#include <atomic>
#ifdef WIN32

View File

@ -3,7 +3,9 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <util/tokenpipe.h>
#if defined(HAVE_CONFIG_H)
#include <config/bitcoin-config.h>
#endif
#ifndef WIN32