From 70171e012a7cd6723aa2b07a3fb3d93920ec2010 Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Tue, 6 Feb 2024 22:18:39 +0000 Subject: [PATCH] build: remove bitcoin-config.h where no longer needed This list was generated in a similar fashion as the previous commit: grepping for all files which include bitcoin-config.h, and excluding the ones which don't contain any of the tokens. --- src/compat/compat.h | 4 ---- src/crypto/muhash.h | 4 ---- src/netaddress.h | 4 ---- src/netbase.h | 4 ---- src/qt/addressbookpage.cpp | 4 ---- src/qt/askpassphrasedialog.cpp | 4 ---- src/qt/coincontroldialog.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/transactiondesc.cpp | 4 ---- src/qt/walletmodel.cpp | 4 ---- src/qt/walletmodel.h | 4 ---- src/qt/walletmodeltransaction.cpp | 4 ---- src/support/lockedpool.cpp | 4 ---- src/sync.cpp | 4 ---- src/validation.h | 4 ---- 19 files changed, 76 deletions(-) diff --git a/src/compat/compat.h b/src/compat/compat.h index 435a403552450b..9ff9a335f81197 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/muhash.h b/src/crypto/muhash.h index 53c5a91a03d9ad..cb53e1743ea2f2 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/netaddress.h b/src/netaddress.h index 0bbde43dd7ad9b..c697b7e0a33750 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 8523f59b4d129a..1bd95ba0d97e16 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 05e58191fce20a..f2f9371c650e09 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 246dff00692151..a4771bbb829446 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/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 9e49fd87fb8e39..5e412bd6b19ddb 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/paymentserver.cpp b/src/qt/paymentserver.cpp index 592e591edb8e3c..d4c325b7b1cc8b 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 f73aa1e61e9af5..b9ea97d5ec5071 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 0536635c84de39..d8102c1dca8368 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 787a52b8b34116..aa2ea0498e87df 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 9007b183aa6e51..10abcb00eb8164 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/transactiondesc.cpp b/src/qt/transactiondesc.cpp index a916e4ead6f21d..b848b8fe94f2a5 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 9821f8504a5af2..fdfba353ce52fe 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 68218b0c1b37f8..503ee16823c5a1 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 61ccd9dd82ecfb..8222672bf3331e 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/support/lockedpool.cpp b/src/support/lockedpool.cpp index f92d1d8fb7dd95..fe3ba38cde26cf 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 58752a9f182de9..a8bdfc1dea0ee5 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/validation.h b/src/validation.h index fd9b53df8f2d72..94765bfbcd8a64 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