From 9d1dbbd4ceb8c04340927f5127195dc306adf3fc Mon Sep 17 00:00:00 2001 From: TheCharlatan Date: Tue, 13 Feb 2024 08:03:02 +0100 Subject: [PATCH] scripted-diff: Fix bitcoin_config_h includes -BEGIN VERIFY SCRIPT- regex_string='^(?!//).*(AC_APPLE_UNIVERSAL_BUILD|BOOST_PROCESS_USE_STD_FS|CHAR_EQUALS_INT8|CLIENT_VERSION_BUILD|CLIENT_VERSION_IS_RELEASE|CLIENT_VERSION_MAJOR|CLIENT_VERSION_MINOR|COPYRIGHT_HOLDERS|COPYRIGHT_HOLDERS_FINAL|COPYRIGHT_HOLDERS_SUBSTITUTION|COPYRIGHT_YEAR|ENABLE_ARM_SHANI|ENABLE_AVX2|ENABLE_EXTERNAL_SIGNER|ENABLE_SSE41|ENABLE_TRACING|ENABLE_WALLET|ENABLE_X86_SHANI|ENABLE_ZMQ|HAVE_BOOST|HAVE_BUILTIN_CLZL|HAVE_BUILTIN_CLZLL|HAVE_BYTESWAP_H|HAVE_CLMUL|HAVE_CONSENSUS_LIB|HAVE_CXX20|HAVE_DECL_BE16TOH|HAVE_DECL_BE32TOH|HAVE_DECL_BE64TOH|HAVE_DECL_BSWAP_16|HAVE_DECL_BSWAP_32|HAVE_DECL_BSWAP_64|HAVE_DECL_FORK|HAVE_DECL_FREEIFADDRS|HAVE_DECL_GETIFADDRS|HAVE_DECL_HTOBE16|HAVE_DECL_HTOBE32|HAVE_DECL_HTOBE64|HAVE_DECL_HTOLE16|HAVE_DECL_HTOLE32|HAVE_DECL_HTOLE64|HAVE_DECL_LE16TOH|HAVE_DECL_LE32TOH|HAVE_DECL_LE64TOH|HAVE_DECL_PIPE2|HAVE_DECL_SETSID|HAVE_DECL_STRERROR_R|HAVE_DEFAULT_VISIBILITY_ATTRIBUTE|HAVE_DLFCN_H|HAVE_DLLEXPORT_ATTRIBUTE|HAVE_ENDIAN_H|HAVE_EVHTTP_CONNECTION_GET_PEER_CONST_CHAR|HAVE_FDATASYNC|HAVE_GETENTROPY_RAND|HAVE_GETRANDOM|HAVE_GMTIME_R|HAVE_INTTYPES_H|HAVE_LIBADVAPI32|HAVE_LIBCOMCTL32|HAVE_LIBCOMDLG32|HAVE_LIBGDI32|HAVE_LIBIPHLPAPI|HAVE_LIBKERNEL32|HAVE_LIBOLE32|HAVE_LIBOLEAUT32|HAVE_LIBSHELL32|HAVE_LIBSHLWAPI|HAVE_LIBUSER32|HAVE_LIBUUID|HAVE_LIBWINMM|HAVE_LIBWS2_32|HAVE_MALLOC_INFO|HAVE_MALLOPT_ARENA_MAX|HAVE_MINIUPNPC_MINIUPNPC_H|HAVE_MINIUPNPC_UPNPCOMMANDS_H|HAVE_MINIUPNPC_UPNPERRORS_H|HAVE_NATPMP_H|HAVE_O_CLOEXEC|HAVE_POSIX_FALLOCATE|HAVE_PTHREAD|HAVE_PTHREAD_PRIO_INHERIT|HAVE_STDINT_H|HAVE_STDIO_H|HAVE_STDLIB_H|HAVE_STRERROR_R|HAVE_STRINGS_H|HAVE_STRING_H|HAVE_STRONG_GETAUXVAL|HAVE_SYSCTL|HAVE_SYSCTL_ARND|HAVE_SYSTEM|HAVE_SYS_ENDIAN_H|HAVE_SYS_PRCTL_H|HAVE_SYS_RESOURCES_H|HAVE_SYS_SELECT_H|HAVE_SYS_STAT_H|HAVE_SYS_SYSCTL_H|HAVE_SYS_TYPES_H|HAVE_SYS_VMMETER_H|HAVE_THREAD_LOCAL|HAVE_TIMINGSAFE_BCMP|HAVE_UNISTD_H|HAVE_VM_VM_PARAM_H|LT_OBJDIR|PACKAGE_BUGREPORT|PACKAGE_NAME|PACKAGE_STRING|PACKAGE_TARNAME|PACKAGE_URL|PACKAGE_VERSION|PTHREAD_CREATE_JOINABLE|QT_QPA_PLATFORM_ANDROID|QT_QPA_PLATFORM_COCOA|QT_QPA_PLATFORM_MINIMAL|QT_QPA_PLATFORM_WINDOWS|QT_QPA_PLATFORM_XCB|QT_STATICPLUGIN|STDC_HEADERS|STRERROR_R_CHAR_P|USE_ASM|USE_BDB|USE_DBUS|USE_NATPMP|USE_QRCODE|USE_SQLITE|USE_UPNP|_FILE_OFFSET_BITS|_LARGE_FILES)' exclusion_files=":(exclude)src/minisketch :(exclude)src/crc32c :(exclude)src/secp256k1 :(exclude)src/crypto/sha256_arm_shani.cpp :(exclude)src/crypto/sha256_avx2.cpp :(exclude)src/crypto/sha256_sse41.cpp :(exclude)src/crypto/sha256_x86_shani.cpp" git grep --perl-regexp --files-with-matches "$regex_string" -- '*.cpp' $exclusion_files | xargs git grep -L "bitcoin-config.h" | while read -r file; do line_number=$(awk -v my_file="$file" '/\/\/ file COPYING or https?:\/\/www.opensource.org\/licenses\/mit-license.php\./ {line = NR} /^\/\// && NR == line + 1 {while(getline && /^\/\//) line = NR} END {print line+1}' "$file"); sed -i "${line_number}i\\\\n\#if defined(HAVE_CONFIG_H)\\n#include \\n\#endif" "$file"; done; git grep --perl-regexp --files-with-matches "$regex_string" -- '*.h' $exclusion_files | xargs git grep -L "bitcoin-config.h" | while read -r file; do sed -i "/#define.*_H/a \\\\n\#if defined(HAVE_CONFIG_H)\\n#include \\n\#endif" "$file"; done; for file in $(git grep --files-with-matches 'bitcoin-config.h' -- '*.cpp' '*.h' $exclusion_files); do if ! grep -q --perl-regexp "$regex_string" $file; then sed -i '/HAVE_CONFIG_H/{N;N;N;d;}' $file; fi; done; -END VERIFY SCRIPT- The first command creates a regular expression for matching all bitcoin-config.h symbols in the following form: ^(?!//).*(AC_APPLE_UNIVERSAL_BUILD|BOOST_PROCESS_USE_STD_FS|...|_LARGE_FILES). It was generated with: ./autogen.sh && printf '^(?!//).*(%s)' $(awk '/^#undef/ {print $2}' src/config/bitcoin-config.h.in | paste -sd "|" -) The second command holds a list of files and directories that should not be processed. These include subtree directories as well as some crypto files that already get their symbols through the makefile. The third command checks for missing bitcoin-config headers in .cpp files and adds the header if it is missing. The fourth command checks for missing bitcoin-config headers in .h files and adds the header if it is missing. The fifth command checks for unneeded bitcoin-config headers in sources files and removes the header if it is unneeded. --- src/addrdb.cpp | 4 ++++ src/addrman.cpp | 4 ++++ src/bench/verify_script.cpp | 4 ++++ src/bench/wallet_create.cpp | 4 ++++ src/bench/wallet_loading.cpp | 4 ++++ src/clientversion.cpp | 4 ++++ src/common/system.cpp | 4 ++++ src/compat/compat.h | 4 ---- src/crypto/chacha20poly1305.cpp | 4 ++++ src/crypto/muhash.h | 4 ---- src/crypto/sha256.cpp | 4 ++++ src/netaddress.h | 4 ---- src/netbase.h | 4 ---- src/qt/addressbookpage.cpp | 4 ---- src/qt/askpassphrasedialog.cpp | 4 ---- src/qt/bitcoingui.cpp | 4 ++++ src/qt/clientmodel.cpp | 4 ++++ src/qt/coincontroldialog.cpp | 4 ---- src/qt/guiutil.cpp | 4 ++++ src/qt/modaloverlay.cpp | 4 ++++ src/qt/notificator.cpp | 4 ++++ src/qt/paymentserver.cpp | 4 ---- src/qt/paymentserver.h | 4 ---- src/qt/sendcoinsentry.cpp | 4 ---- src/qt/sendcoinsrecipient.h | 4 ---- src/qt/test/apptests.cpp | 4 ---- src/qt/test/optiontests.cpp | 4 ++++ src/qt/transactiondesc.cpp | 4 ---- src/qt/walletmodel.cpp | 4 ---- src/qt/walletmodel.h | 4 ---- src/qt/walletmodeltransaction.cpp | 4 ---- src/random.cpp | 4 ++++ src/rest.cpp | 4 ++++ src/rpc/external_signer.cpp | 4 ++++ src/rpc/mining.cpp | 4 ++++ src/rpc/node.cpp | 4 ++++ src/rpc/register.h | 4 ++++ src/rpc/server.cpp | 4 ++++ src/rpc/util.cpp | 4 ++++ src/serialize.h | 4 ++++ src/support/lockedpool.cpp | 4 ---- src/sync.cpp | 4 ---- src/test/script_tests.cpp | 4 ++++ src/test/system_tests.cpp | 4 ++++ src/test/util/setup_common.cpp | 4 ++++ src/validation.cpp | 4 ++++ src/validation.h | 4 ---- src/wallet/init.cpp | 4 ++++ src/wallet/rpc/addresses.cpp | 4 ++++ src/wallet/rpc/backup.cpp | 4 ++++ src/wallet/rpc/wallet.cpp | 4 ++++ src/wallet/sqlite.cpp | 4 ++++ src/wallet/test/db_tests.cpp | 4 ++++ src/wallet/test/util.h | 4 ++++ src/wallet/walletdb.cpp | 4 ++++ src/warnings.cpp | 4 ++++ 56 files changed, 148 insertions(+), 76 deletions(-) diff --git a/src/addrdb.cpp b/src/addrdb.cpp index 8cf932bcb63..fd2a363b8ad 100644 --- a/src/addrdb.cpp +++ b/src/addrdb.cpp @@ -3,6 +3,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/addrman.cpp b/src/addrman.cpp index a8206de6ee2..a38f7cf41e0 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -3,6 +3,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/bench/verify_script.cpp b/src/bench/verify_script.cpp index 3682b335187..e7166a91cf4 100644 --- a/src/bench/verify_script.cpp +++ b/src/bench/verify_script.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include #if defined(HAVE_CONSENSUS_LIB) diff --git a/src/bench/wallet_create.cpp b/src/bench/wallet_create.cpp index 993c4c4b3fd..32f55f51e15 100644 --- a/src/bench/wallet_create.cpp +++ b/src/bench/wallet_create.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include #include diff --git a/src/bench/wallet_loading.cpp b/src/bench/wallet_loading.cpp index b17c7fe05a8..6305126c7d4 100644 --- a/src/bench/wallet_loading.cpp +++ b/src/bench/wallet_loading.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include #include diff --git a/src/clientversion.cpp b/src/clientversion.cpp index e7d63e34c6a..bf5579ee697 100644 --- a/src/clientversion.cpp +++ b/src/clientversion.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/common/system.cpp b/src/common/system.cpp index ba42c6df502..1fa53a5f34c 100644 --- a/src/common/system.cpp +++ b/src/common/system.cpp @@ -3,6 +3,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/compat/compat.h b/src/compat/compat.h index 435a4035524..9ff9a335f81 100644 --- a/src/compat/compat.h +++ b/src/compat/compat.h @@ -6,10 +6,6 @@ #ifndef BITCOIN_COMPAT_COMPAT_H #define BITCOIN_COMPAT_COMPAT_H -#if defined(HAVE_CONFIG_H) -#include -#endif - // Windows defines FD_SETSIZE to 64 (see _fd_types.h in mingw-w64), // which is too small for our usage, but allows us to redefine it safely. // We redefine it to be 1024, to match glibc, see typesizes.h. diff --git a/src/crypto/chacha20poly1305.cpp b/src/crypto/chacha20poly1305.cpp index 59671d304c4..3e8051c2dc4 100644 --- a/src/crypto/chacha20poly1305.cpp +++ b/src/crypto/chacha20poly1305.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/crypto/muhash.h b/src/crypto/muhash.h index 53c5a91a03d..cb53e1743ea 100644 --- a/src/crypto/muhash.h +++ b/src/crypto/muhash.h @@ -5,10 +5,6 @@ #ifndef BITCOIN_CRYPTO_MUHASH_H #define BITCOIN_CRYPTO_MUHASH_H -#if defined(HAVE_CONFIG_H) -#include -#endif - #include #include diff --git a/src/crypto/sha256.cpp b/src/crypto/sha256.cpp index 11aabeb1da9..36ef6d9a1a9 100644 --- a/src/crypto/sha256.cpp +++ b/src/crypto/sha256.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/netaddress.h b/src/netaddress.h index 0bbde43dd7a..c697b7e0a33 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -5,10 +5,6 @@ #ifndef BITCOIN_NETADDRESS_H #define BITCOIN_NETADDRESS_H -#if defined(HAVE_CONFIG_H) -#include -#endif - #include #include #include diff --git a/src/netbase.h b/src/netbase.h index 8523f59b4d1..1bd95ba0d97 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -5,10 +5,6 @@ #ifndef BITCOIN_NETBASE_H #define BITCOIN_NETBASE_H -#if defined(HAVE_CONFIG_H) -#include -#endif - #include #include #include diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index 05e58191fce..f2f9371c650 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -2,10 +2,6 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#if defined(HAVE_CONFIG_H) -#include -#endif - #include #include diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index 246dff00692..a4771bbb829 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -2,10 +2,6 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#if defined(HAVE_CONFIG_H) -#include -#endif - #include #include diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index fd71938b606..9bbfe5a6de0 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index ff7405d1395..c31e06e88e5 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 9e49fd87fb8..5e412bd6b19 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -2,10 +2,6 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#if defined(HAVE_CONFIG_H) -#include -#endif - #include #include diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index ebfd14cc254..084b9a66158 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp index b09e230bce7..667db06574e 100644 --- a/src/qt/modaloverlay.cpp +++ b/src/qt/modaloverlay.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp index 88bc33098a3..2021e5f9dc5 100644 --- a/src/qt/notificator.cpp +++ b/src/qt/notificator.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 592e591edb8..d4c325b7b1c 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -2,10 +2,6 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#if defined(HAVE_CONFIG_H) -#include -#endif - #include #include diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h index f73aa1e61e9..b9ea97d5ec5 100644 --- a/src/qt/paymentserver.h +++ b/src/qt/paymentserver.h @@ -32,10 +32,6 @@ // sends them to the server. // -#if defined(HAVE_CONFIG_H) -#include -#endif - #include #include diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index 0536635c84d..d8102c1dca8 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -2,10 +2,6 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#if defined(HAVE_CONFIG_H) -#include -#endif - #include #include diff --git a/src/qt/sendcoinsrecipient.h b/src/qt/sendcoinsrecipient.h index 787a52b8b34..aa2ea0498e8 100644 --- a/src/qt/sendcoinsrecipient.h +++ b/src/qt/sendcoinsrecipient.h @@ -5,10 +5,6 @@ #ifndef BITCOIN_QT_SENDCOINSRECIPIENT_H #define BITCOIN_QT_SENDCOINSRECIPIENT_H -#if defined(HAVE_CONFIG_H) -#include -#endif - #include #include diff --git a/src/qt/test/apptests.cpp b/src/qt/test/apptests.cpp index 9007b183aa6..10abcb00eb8 100644 --- a/src/qt/test/apptests.cpp +++ b/src/qt/test/apptests.cpp @@ -14,10 +14,6 @@ #include #include -#if defined(HAVE_CONFIG_H) -#include -#endif - #include #include #include diff --git a/src/qt/test/optiontests.cpp b/src/qt/test/optiontests.cpp index 7100603616c..b76e9ef499f 100644 --- a/src/qt/test/optiontests.cpp +++ b/src/qt/test/optiontests.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include #include diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index a916e4ead6f..b848b8fe94f 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -2,10 +2,6 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifdef HAVE_CONFIG_H -#include -#endif - #include #include diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 9821f8504a5..fdfba353ce5 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -2,10 +2,6 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#if defined(HAVE_CONFIG_H) -#include -#endif - #include #include diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index 68218b0c1b3..503ee16823c 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -5,10 +5,6 @@ #ifndef BITCOIN_QT_WALLETMODEL_H #define BITCOIN_QT_WALLETMODEL_H -#if defined(HAVE_CONFIG_H) -#include -#endif - #include #include diff --git a/src/qt/walletmodeltransaction.cpp b/src/qt/walletmodeltransaction.cpp index 61ccd9dd82e..8222672bf33 100644 --- a/src/qt/walletmodeltransaction.cpp +++ b/src/qt/walletmodeltransaction.cpp @@ -2,10 +2,6 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifdef HAVE_CONFIG_H -#include -#endif - #include #include diff --git a/src/random.cpp b/src/random.cpp index ce4266a5675..4fc90997048 100644 --- a/src/random.cpp +++ b/src/random.cpp @@ -3,6 +3,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/rest.cpp b/src/rest.cpp index fbbf6cfa847..91184745c88 100644 --- a/src/rest.cpp +++ b/src/rest.cpp @@ -3,6 +3,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/rpc/external_signer.cpp b/src/rpc/external_signer.cpp index 310eec5f15e..8d06ae42589 100644 --- a/src/rpc/external_signer.cpp +++ b/src/rpc/external_signer.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include #include diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index f1abfb6396c..ff39a31a438 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -3,6 +3,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include #include diff --git a/src/rpc/node.cpp b/src/rpc/node.cpp index b085828215d..45053f882dd 100644 --- a/src/rpc/node.cpp +++ b/src/rpc/node.cpp @@ -3,6 +3,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include #include diff --git a/src/rpc/register.h b/src/rpc/register.h index c88f49ecf04..fd23dde75b7 100644 --- a/src/rpc/register.h +++ b/src/rpc/register.h @@ -5,6 +5,10 @@ #ifndef BITCOIN_RPC_REGISTER_H #define BITCOIN_RPC_REGISTER_H +#if defined(HAVE_CONFIG_H) +#include +#endif + /** These are in one header file to avoid creating tons of single-function * headers for everything under src/rpc/ */ class CRPCTable; diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index e1ac510cbaa..e7d1e3db4e5 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -3,6 +3,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp index cf48ee11e7b..d7317f429c1 100644 --- a/src/rpc/util.cpp +++ b/src/rpc/util.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include #include diff --git a/src/serialize.h b/src/serialize.h index 19585c630ab..628fb87bd28 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -6,6 +6,10 @@ #ifndef BITCOIN_SERIALIZE_H #define BITCOIN_SERIALIZE_H +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include // IWYU pragma: keep #include diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp index f92d1d8fb7d..fe3ba38cde2 100644 --- a/src/support/lockedpool.cpp +++ b/src/support/lockedpool.cpp @@ -5,10 +5,6 @@ #include #include -#if defined(HAVE_CONFIG_H) -#include -#endif - #ifdef WIN32 #include #else diff --git a/src/sync.cpp b/src/sync.cpp index 58752a9f182..a8bdfc1dea0 100644 --- a/src/sync.cpp +++ b/src/sync.cpp @@ -2,10 +2,6 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#if defined(HAVE_CONFIG_H) -#include -#endif - #include #include diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index 1f674408b2c..ac457d9c77b 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp index 6a96b60db0e..76a8f80ba18 100644 --- a/src/test/system_tests.cpp +++ b/src/test/system_tests.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. // + +#if defined(HAVE_CONFIG_H) +#include +#endif #include #include #include diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp index 9f587d7ec0b..1f8dbac5bed 100644 --- a/src/test/util/setup_common.cpp +++ b/src/test/util/setup_common.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/validation.cpp b/src/validation.cpp index caa4ff3115c..4eb924fa590 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -3,6 +3,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/validation.h b/src/validation.h index fd9b53df8f2..94765bfbcd8 100644 --- a/src/validation.h +++ b/src/validation.h @@ -6,10 +6,6 @@ #ifndef BITCOIN_VALIDATION_H #define BITCOIN_VALIDATION_H -#if defined(HAVE_CONFIG_H) -#include -#endif - #include #include #include diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index 088343458cc..f151fad7402 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -3,6 +3,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include #include diff --git a/src/wallet/rpc/addresses.cpp b/src/wallet/rpc/addresses.cpp index e9b93afc30b..acaa2d8b157 100644 --- a/src/wallet/rpc/addresses.cpp +++ b/src/wallet/rpc/addresses.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include #include diff --git a/src/wallet/rpc/backup.cpp b/src/wallet/rpc/backup.cpp index 99c548bf1d5..fb2be7eb7ba 100644 --- a/src/wallet/rpc/backup.cpp +++ b/src/wallet/rpc/backup.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include #include diff --git a/src/wallet/rpc/wallet.cpp b/src/wallet/rpc/wallet.cpp index 391153a2a17..fb10b240136 100644 --- a/src/wallet/rpc/wallet.cpp +++ b/src/wallet/rpc/wallet.cpp @@ -3,6 +3,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include #include diff --git a/src/wallet/sqlite.cpp b/src/wallet/sqlite.cpp index cff36280496..a0b0cf5c1e8 100644 --- a/src/wallet/sqlite.cpp +++ b/src/wallet/sqlite.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/wallet/test/db_tests.cpp b/src/wallet/test/db_tests.cpp index 7e6219378ff..1a99e55a2ef 100644 --- a/src/wallet/test/db_tests.cpp +++ b/src/wallet/test/db_tests.cpp @@ -2,6 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/wallet/test/util.h b/src/wallet/test/util.h index 8bd238648ff..9f2974ece6b 100644 --- a/src/wallet/test/util.h +++ b/src/wallet/test/util.h @@ -5,6 +5,10 @@ #ifndef BITCOIN_WALLET_TEST_UTIL_H #define BITCOIN_WALLET_TEST_UTIL_H +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index f3dd5b328e7..881b23230c8 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -3,6 +3,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include diff --git a/src/warnings.cpp b/src/warnings.cpp index cb73c7aea2d..84b021dad54 100644 --- a/src/warnings.cpp +++ b/src/warnings.cpp @@ -3,6 +3,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include +#endif + #include #include