Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-29 05:22:30 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Diff-minimise

Browse Source
This commit is contained in:
Luke Dashjr 2024-05-15 16:40:24 +00:00
parent 7f59fa85fc
commit e310e17cad
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_msvc/bitcoin_config.h.in
View File

@ -41,9 +41,6 @@
/* Define this symbol to enable ZMQ functions */ /* Define this symbol to enable ZMQ functions */
#define ENABLE_ZMQ 1 #define ENABLE_ZMQ 1
/* define if external signer support is enabled (requires Boost::Process) */
#define ENABLE_EXTERNAL_SIGNER /**/
/* Define to 1 if you have the declaration of `be16toh', and to 0 if you /* Define to 1 if you have the declaration of `be16toh', and to 0 if you
don't. */ don't. */
#define HAVE_DECL_BE16TOH 0 #define HAVE_DECL_BE16TOH 0

1
build_msvc/vcpkg.json
View File

@ -5,7 +5,6 @@
"berkeleydb", "berkeleydb",
"boost-date-time", "boost-date-time",
"boost-multi-index", "boost-multi-index",
"boost-process",
"boost-signals2", "boost-signals2",
"boost-test", "boost-test",
"libevent", "libevent",

16
configure.ac
View File

@ -1454,9 +1454,19 @@ if test "$use_external_signer" != "no"; then
CXXFLAGS="$TEMP_CXXFLAGS" CXXFLAGS="$TEMP_CXXFLAGS"
AC_MSG_RESULT([$have_boost_process]) AC_MSG_RESULT([$have_boost_process])
if test "$have_boost_process" = "yes"; then if test "$have_boost_process" = "yes"; then
use_external_signer="yes" case "always enable" in
AC_DEFINE([ENABLE_EXTERNAL_SIGNER], [1], [Define if external signer support is enabled]) dnl Boost Process for Windows uses Boost ASIO. Boost ASIO performs
AC_DEFINE([BOOST_PROCESS_USE_STD_FS], [1], [Defined to avoid Boost::Process trying to use Boost Filesystem]) dnl pre-main init of Windows networking libraries, which we do not
dnl want.
*mingw*)
use_external_signer="no"
;;
*)
use_external_signer="yes"
AC_DEFINE([ENABLE_EXTERNAL_SIGNER], [1], [Define if external signer support is enabled])
AC_DEFINE([BOOST_PROCESS_USE_STD_FS], [1], [Defined to avoid Boost::Process trying to use Boost Filesystem])
;;
esac
else else
if test "$use_external_signer" = "yes"; then if test "$use_external_signer" = "yes"; then
AC_MSG_ERROR([External signing is not supported for this Boost version]) AC_MSG_ERROR([External signing is not supported for this Boost version])

2
src/test/system_tests.cpp
View File

@ -102,8 +102,8 @@ BOOST_AUTO_TEST_CASE(run_command)
#endif #endif
BOOST_CHECK_EXCEPTION(RunCommandParseJSON(command), std::runtime_error, HasReason("Unable to parse JSON: {")); BOOST_CHECK_EXCEPTION(RunCommandParseJSON(command), std::runtime_error, HasReason("Unable to parse JSON: {"));
} }
// Test std::in, except for Windows
#ifndef WIN32 #ifndef WIN32
// Test std::in
{ {
const UniValue result = RunCommandParseJSON("cat", "{\"success\": true}"); const UniValue result = RunCommandParseJSON("cat", "{\"success\": true}");
BOOST_CHECK(result.isObject()); BOOST_CHECK(result.isObject());