sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-23 19:12:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

partial revert dash#2911: s/dash-config/bitcoin-config/g

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2022-08-02 22:04:58 +05:30
parent ece4e1ee87
commit c587212f8c
64 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -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

4
configure.ac
View File

@ -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

2
contrib/debian/rules
View File

@ -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)

8
src/Makefile.am
View File

@ -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:

4
src/clientversion.h
View File

@ -6,12 +6,12 @@
#define BITCOIN_CLIENTVERSION_H
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#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
/**

2
src/compat.h
View File

@ -7,7 +7,7 @@
#define BITCOIN_COMPAT_H
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#ifdef WIN32

2
src/compat/byteswap.h
View File

@ -6,7 +6,7 @@
#define BITCOIN_COMPAT_BYTESWAP_H
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <stdint.h>

2
src/compat/endian.h
View File

@ -6,7 +6,7 @@
#define BITCOIN_COMPAT_ENDIAN_H
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <compat/byteswap.h>

2
src/compat/glibc_compat.cpp
View File

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

2
src/compat/stdin.cpp
View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <cstdio> // for fileno(), stdin

2
src/compat/strnlen.cpp
View File

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

2
src/crypto/common.h
View File

@ -6,7 +6,7 @@
#define BITCOIN_CRYPTO_COMMON_H
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <stdint.h>

2
src/crypto/muhash.h
View File

@ -6,7 +6,7 @@
#define BITCOIN_CRYPTO_MUHASH_H
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <serialize.h>

2
src/dash-cli.cpp
View File

@ -5,7 +5,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <chainparamsbase.h>

2
src/dash-tx.cpp
View File

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

2
src/dash-wallet.cpp
View File

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

2
src/dashd.cpp
View File

@ -5,7 +5,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <chainparams.h>

2
src/init.cpp
View File

@ -5,7 +5,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <init.h>

2
src/interfaces/node.cpp
View File

@ -41,7 +41,7 @@
#include <warnings.h>
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <coinjoin/coinjoin.h>

2
src/mapport.cpp
View File

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

2
src/net.cpp
View File

@ -5,7 +5,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <net.h>

2
src/netaddress.h
View File

@ -6,7 +6,7 @@
#define BITCOIN_NETADDRESS_H
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <attributes.h>

2
src/netbase.h
View File

@ -6,7 +6,7 @@
#define BITCOIN_NETBASE_H
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <compat.h>

2
src/qt/addressbookpage.cpp
View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/addressbookpage.h>

2
src/qt/appearancewidget.cpp
View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/forms/ui_appearancewidget.h>

2
src/qt/askpassphrasedialog.cpp
View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/askpassphrasedialog.h>

2
src/qt/bitcoingui.h
View File

@ -6,7 +6,7 @@
#define BITCOIN_QT_BITCOINGUI_H
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/optionsdialog.h>

2
src/qt/coincontroldialog.cpp
View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/coincontroldialog.h>

2
src/qt/createwalletdialog.cpp
View File

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

2
src/qt/dash.cpp
View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/dash.h>

2
src/qt/dash.h
View File

@ -6,7 +6,7 @@
#define BITCOIN_QT_DASH_H
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <QApplication>

2
src/qt/intro.cpp
View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <fs.h>

2
src/qt/notificator.h
View File

@ -6,7 +6,7 @@
#define BITCOIN_QT_NOTIFICATOR_H
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <QIcon>

2
src/qt/optionsdialog.cpp
View File

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

2
src/qt/optionsmodel.cpp
View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/optionsmodel.h>

2
src/qt/paymentserver.cpp
View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/paymentserver.h>

2
src/qt/paymentserver.h
View File

@ -33,7 +33,7 @@
//
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/walletmodel.h>

2
src/qt/qrdialog.cpp
View File

@ -14,7 +14,7 @@
#include <QPixmap>
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h> /* for USE_QRCODE */
#include <config/bitcoin-config.h> /* for USE_QRCODE */
#endif
QRDialog::QRDialog(QWidget *parent) :

2
src/qt/qrimagewidget.cpp
View File

@ -15,7 +15,7 @@
#include <QPainter>
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h> /* for USE_QRCODE */
#include <config/bitcoin-config.h> /* for USE_QRCODE */
#endif
#ifdef USE_QRCODE

2
src/qt/receiverequestdialog.cpp
View File

@ -14,7 +14,7 @@
#include <QPixmap>
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h> /* for USE_QRCODE */
#include <config/bitcoin-config.h> /* for USE_QRCODE */
#endif
ReceiveRequestDialog::ReceiveRequestDialog(QWidget *parent) :

2
src/qt/rpcconsole.cpp
View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/rpcconsole.h>

2
src/qt/sendcoinsdialog.cpp
View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/sendcoinsdialog.h>

2
src/qt/sendcoinsentry.cpp
View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/sendcoinsentry.h>

2
src/qt/splashscreen.cpp
View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/splashscreen.h>

2
src/qt/test/apptests.cpp
View File

@ -16,7 +16,7 @@
#include <validation.h>
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <QAction>

2
src/qt/test/compattests.cpp
View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/test/compattests.h>

2
src/qt/test/test_main.cpp
View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <interfaces/node.h>

2
src/qt/transactiondesc.cpp
View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifdef HAVE_CONFIG_H
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/transactiondesc.h>

2
src/qt/utilitydialog.cpp
View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/utilitydialog.h>

2
src/qt/walletmodel.cpp
View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/walletmodel.h>

2
src/qt/walletmodel.h
View File

@ -11,7 +11,7 @@
#include <script/standard.h>
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/walletmodeltransaction.h>

2
src/qt/walletmodeltransaction.cpp
View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifdef HAVE_CONFIG_H
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <qt/walletmodeltransaction.h>

2
src/randomenv.cpp
View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <randomenv.h>

2
src/script/dashconsensus.h
View File

@ -9,7 +9,7 @@
#include <stdint.h>
#if defined(BUILD_BITCOIN_INTERNAL) && defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#if defined(_WIN32)
#if defined(DLL_EXPORT)
#if defined(HAVE_FUNC_ATTRIBUTE_DLLEXPORT)

2
src/stacktraces.cpp
View File

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

2
src/support/lockedpool.cpp
View File

@ -6,7 +6,7 @@
#include <support/cleanse.h>
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#ifdef WIN32

2
src/sync.cpp
View File

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

2
src/test/util_threadnames_tests.cpp
View File

@ -11,7 +11,7 @@
#include <mutex>
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <boost/test/unit_test.hpp>

2
src/timedata.cpp
View File

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

2
src/util/check.h
View File

@ -6,7 +6,7 @@
#define BITCOIN_UTIL_CHECK_H
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <tinyformat.h>

2
src/util/system.h
View File

@ -12,7 +12,7 @@
#define BITCOIN_UTIL_SYSTEM_H
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <attributes.h>

2
src/util/threadnames.cpp
View File

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

2
src/util/time.cpp
View File

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

2
src/validation.h
View File

@ -8,7 +8,7 @@
#define BITCOIN_VALIDATION_H
#if defined(HAVE_CONFIG_H)
#include <config/dash-config.h>
#include <config/bitcoin-config.h>
#endif
#include <amount.h>