diff --git a/.gitignore b/.gitignore index 682b74bb19..239014b41d 100644 --- a/.gitignore +++ b/.gitignore @@ -40,8 +40,8 @@ config.log config.status configure libtool -src/config/dash-config.h -src/config/dash-config.h.in +src/config/bitcoin-config.h +src/config/bitcoin-config.h.in src/config/stamp-h1 src/obj share/setup.nsi diff --git a/configure.ac b/configure.ac index 41150f9a81..1e71ad97b2 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ define(_COPYRIGHT_HOLDERS,[The %s developers]) define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Dash Core]]) AC_INIT([Dash Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_BUILD)m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/dashpay/dash/issues],[dashcore],[https://dash.org/]) AC_CONFIG_SRCDIR([src/validation.cpp]) -AC_CONFIG_HEADERS([src/config/dash-config.h]) +AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([build-aux/m4]) @@ -809,7 +809,7 @@ AC_C_BIGENDIAN dnl Check for pthread compile/link requirements AX_PTHREAD -dnl The following macro will add the necessary defines to dash-config.h, but +dnl The following macro will add the necessary defines to bitcoin-config.h, but dnl they also need to be passed down to any subprojects. Pull the results out of dnl the cache and add them to CPPFLAGS. AC_SYS_LARGEFILE diff --git a/contrib/debian/rules b/contrib/debian/rules index bc99302c55..d55a3fa6bf 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -10,7 +10,7 @@ override_dh_auto_clean: if [ -f Makefile ]; then $(MAKE) distclean; fi - rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/dash-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in + rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/bitcoin-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in QT=$(shell dpkg-vendor --derives-from Ubuntu && echo qt4 || echo qt5) diff --git a/src/Makefile.am b/src/Makefile.am index 539821b3dc..657c91c478 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -883,12 +883,12 @@ CLEANFILES += obj/build.h EXTRA_DIST = $(CTAES_DIST) -config/dash-config.h: config/stamp-h1 +config/bitcoin-config.h: config/stamp-h1 @$(MAKE) -C $(top_builddir) $(subdir)/$(@) -config/stamp-h1: $(top_srcdir)/$(subdir)/config/dash-config.h.in $(top_builddir)/config.status +config/stamp-h1: $(top_srcdir)/$(subdir)/config/bitcoin-config.h.in $(top_builddir)/config.status $(AM_V_at)$(MAKE) -C $(top_builddir) $(subdir)/$(@) -$(top_srcdir)/$(subdir)/config/dash-config.h.in: $(am__configure_deps) - $(AM_V_at)$(MAKE) -C $(top_srcdir) $(subdir)/config/dash-config.h.in +$(top_srcdir)/$(subdir)/config/bitcoin-config.h.in: $(am__configure_deps) + $(AM_V_at)$(MAKE) -C $(top_srcdir) $(subdir)/config/bitcoin-config.h.in clean-local: diff --git a/src/clientversion.h b/src/clientversion.h index 5072874790..245688ecae 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -6,12 +6,12 @@ #define BITCOIN_CLIENTVERSION_H #if defined(HAVE_CONFIG_H) -#include +#include #endif //HAVE_CONFIG_H // Check that required client information is defined #if !defined(CLIENT_VERSION_MAJOR) || !defined(CLIENT_VERSION_MINOR) || !defined(CLIENT_VERSION_BUILD) || !defined(CLIENT_VERSION_IS_RELEASE) || !defined(COPYRIGHT_YEAR) -#error Client version information missing: version is not defined by dash-config.h or in any other way +#error Client version information missing: version is not defined by bitcoin-config.h or in any other way #endif /** diff --git a/src/compat.h b/src/compat.h index b22bed897d..ff5b46962b 100644 --- a/src/compat.h +++ b/src/compat.h @@ -7,7 +7,7 @@ #define BITCOIN_COMPAT_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #ifdef WIN32 diff --git a/src/compat/byteswap.h b/src/compat/byteswap.h index 60961e6208..20db6a45ad 100644 --- a/src/compat/byteswap.h +++ b/src/compat/byteswap.h @@ -6,7 +6,7 @@ #define BITCOIN_COMPAT_BYTESWAP_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/compat/endian.h b/src/compat/endian.h index 159dc593a5..c547d09bde 100644 --- a/src/compat/endian.h +++ b/src/compat/endian.h @@ -6,7 +6,7 @@ #define BITCOIN_COMPAT_ENDIAN_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/compat/glibc_compat.cpp b/src/compat/glibc_compat.cpp index 07866fab74..198b445071 100644 --- a/src/compat/glibc_compat.cpp +++ b/src/compat/glibc_compat.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/compat/stdin.cpp b/src/compat/stdin.cpp index a818d2242d..98d406cca8 100644 --- a/src/compat/stdin.cpp +++ b/src/compat/stdin.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include // for fileno(), stdin diff --git a/src/compat/strnlen.cpp b/src/compat/strnlen.cpp index beb23626a6..72b69953d0 100644 --- a/src/compat/strnlen.cpp +++ b/src/compat/strnlen.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/crypto/common.h b/src/crypto/common.h index f8440aab68..e14af1f4c4 100644 --- a/src/crypto/common.h +++ b/src/crypto/common.h @@ -6,7 +6,7 @@ #define BITCOIN_CRYPTO_COMMON_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/crypto/muhash.h b/src/crypto/muhash.h index aee517c018..0c050cd32b 100644 --- a/src/crypto/muhash.h +++ b/src/crypto/muhash.h @@ -6,7 +6,7 @@ #define BITCOIN_CRYPTO_MUHASH_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/dash-cli.cpp b/src/dash-cli.cpp index 0d57611382..ea0823e0b0 100644 --- a/src/dash-cli.cpp +++ b/src/dash-cli.cpp @@ -5,7 +5,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/dash-tx.cpp b/src/dash-tx.cpp index 17a7a46a61..6b16e10450 100644 --- a/src/dash-tx.cpp +++ b/src/dash-tx.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/dash-wallet.cpp b/src/dash-wallet.cpp index 4a308b0112..fcdf22d329 100644 --- a/src/dash-wallet.cpp +++ b/src/dash-wallet.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/dashd.cpp b/src/dashd.cpp index 33090fd97c..a616958cab 100644 --- a/src/dashd.cpp +++ b/src/dashd.cpp @@ -5,7 +5,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/init.cpp b/src/init.cpp index 1d4c56a25b..fed793794b 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -5,7 +5,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp index 116bcf9c80..d76bf45bcc 100644 --- a/src/interfaces/node.cpp +++ b/src/interfaces/node.cpp @@ -41,7 +41,7 @@ #include #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/mapport.cpp b/src/mapport.cpp index 248dd584cc..2df4ce45d2 100644 --- a/src/mapport.cpp +++ b/src/mapport.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/net.cpp b/src/net.cpp index d2fec0da2a..f295147188 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -5,7 +5,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/netaddress.h b/src/netaddress.h index ab688656c9..903cc2a1bd 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -6,7 +6,7 @@ #define BITCOIN_NETADDRESS_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/netbase.h b/src/netbase.h index fa57b5914c..eaf31c03da 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -6,7 +6,7 @@ #define BITCOIN_NETBASE_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index 61d03a5cbc..eb347202c8 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/appearancewidget.cpp b/src/qt/appearancewidget.cpp index e74e91ba1b..e265b0ead6 100644 --- a/src/qt/appearancewidget.cpp +++ b/src/qt/appearancewidget.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index eeeeb0df2a..c6b91a092b 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 4a6f27d520..754b45572a 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -6,7 +6,7 @@ #define BITCOIN_QT_BITCOINGUI_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 1dee7436eb..d0e57d0cbe 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/createwalletdialog.cpp b/src/qt/createwalletdialog.cpp index 8e6ce89aab..8e6474b0d4 100644 --- a/src/qt/createwalletdialog.cpp +++ b/src/qt/createwalletdialog.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/dash.cpp b/src/qt/dash.cpp index 901c42c110..a61e7c92b1 100644 --- a/src/qt/dash.cpp +++ b/src/qt/dash.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/dash.h b/src/qt/dash.h index e5c1b3cd3b..744d218a40 100644 --- a/src/qt/dash.h +++ b/src/qt/dash.h @@ -6,7 +6,7 @@ #define BITCOIN_QT_DASH_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index b0eb7ee307..6794abce5c 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/notificator.h b/src/qt/notificator.h index ecd071ff4a..bac7bda622 100644 --- a/src/qt/notificator.h +++ b/src/qt/notificator.h @@ -6,7 +6,7 @@ #define BITCOIN_QT_NOTIFICATOR_H #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 5d8e648919..a0eba83abe 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 1dfa244c2a..935b8216ca 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 4f8d836a17..ee784f12f8 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h index d274b1c56e..d4be4b5651 100644 --- a/src/qt/paymentserver.h +++ b/src/qt/paymentserver.h @@ -33,7 +33,7 @@ // #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/qrdialog.cpp b/src/qt/qrdialog.cpp index a74894fae5..3686d82385 100644 --- a/src/qt/qrdialog.cpp +++ b/src/qt/qrdialog.cpp @@ -14,7 +14,7 @@ #include #if defined(HAVE_CONFIG_H) -#include /* for USE_QRCODE */ +#include /* for USE_QRCODE */ #endif QRDialog::QRDialog(QWidget *parent) : diff --git a/src/qt/qrimagewidget.cpp b/src/qt/qrimagewidget.cpp index 2ad72c0256..531cccc5a7 100644 --- a/src/qt/qrimagewidget.cpp +++ b/src/qt/qrimagewidget.cpp @@ -15,7 +15,7 @@ #include #if defined(HAVE_CONFIG_H) -#include /* for USE_QRCODE */ +#include /* for USE_QRCODE */ #endif #ifdef USE_QRCODE diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp index 46ef6689ec..20b9941899 100644 --- a/src/qt/receiverequestdialog.cpp +++ b/src/qt/receiverequestdialog.cpp @@ -14,7 +14,7 @@ #include #if defined(HAVE_CONFIG_H) -#include /* for USE_QRCODE */ +#include /* for USE_QRCODE */ #endif ReceiveRequestDialog::ReceiveRequestDialog(QWidget *parent) : diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index b1c81659ad..af08fd56d9 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index a08e9a1097..14ad897767 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index 684653a7e2..dbcaa5fa43 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index 34daf82c4e..7392e2f9e1 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/test/apptests.cpp b/src/qt/test/apptests.cpp index d336cc318a..4171dd8bfe 100644 --- a/src/qt/test/apptests.cpp +++ b/src/qt/test/apptests.cpp @@ -16,7 +16,7 @@ #include #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/test/compattests.cpp b/src/qt/test/compattests.cpp index 047bbb8309..a8d3a55973 100644 --- a/src/qt/test/compattests.cpp +++ b/src/qt/test/compattests.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index a9afa16bf5..0a80cd9729 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 22569aaf9c..77d6f1534f 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifdef HAVE_CONFIG_H -#include +#include #endif #include diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 372095428f..fd2e18be27 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index dcdac6c16e..80faadeb69 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) -#include +#include #endif #include diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index 5bad69a469..071afdac0e 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -11,7 +11,7 @@ #include