GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 50729c0609 into merged_master (Bitcoin PR bitcoin/bitcoin#29910)

Browse source
This commit is contained in:
ivanlele 2026-02-18 15:37:43 +00:00
commit dcd431d845
No known key found for this signature in database
4 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Makefile.am
View file

@ -335,7 +335,7 @@ BITCOIN_CORE_H = \
util/sock.h \
util/spanparsing.h \
util/string.h \
util/subprocess.hpp \
util/subprocess.h \
util/syserror.h \
util/task_runner.h \
util/thread.h \

2
src/common/run_command.cpp
View file

@ -12,7 +12,7 @@
#include <univalue.h>
#ifdef ENABLE_EXTERNAL_SIGNER
#include <util/subprocess.hpp>
#include <util/subprocess.h>
#endif // ENABLE_EXTERNAL_SIGNER
UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in)

2
src/test/system_tests.cpp
View file

@ -11,7 +11,7 @@
#include <univalue.h>
#ifdef ENABLE_EXTERNAL_SIGNER
#include <util/subprocess.hpp>
#include <util/subprocess.h>
#endif // ENABLE_EXTERNAL_SIGNER
#include <boost/test/unit_test.hpp>

10
src/util/subprocess.hpp → src/util/subprocess.h
View file

@ -33,8 +33,10 @@ Documentation for C++ subprocessing library.
@version 1.0.0
*/
#ifndef SUBPROCESS_HPP
#define SUBPROCESS_HPP
#ifndef BITCOIN_UTIL_SUBPROCESS_H
#define BITCOIN_UTIL_SUBPROCESS_H
#include <util/syserror.h>
#include <algorithm>
#include <cassert>
@ -150,7 +152,7 @@ class OSError: public std::runtime_error
{
public:
OSError(const std::string& err_msg, int err_code):
std::runtime_error( err_msg + ": " + std::strerror(err_code) )
std::runtime_error(err_msg + ": " + SysErrorString(err_code))
{}
};
@ -1609,4 +1611,4 @@ namespace detail {
}
#endif // SUBPROCESS_HPP
#endif // BITCOIN_UTIL_SUBPROCESS_H