diff options
| author | fanquake <[email protected]> | 2019-07-07 10:35:15 +0800 |
|---|---|---|
| committer | fanquake <[email protected]> | 2019-07-07 10:53:24 +0800 |
| commit | f373beebbcc0c7d1160e02dc638a00b3e6831d98 (patch) | |
| tree | 82010d87db9fe5ce00776a0e8863d642849559c3 /src/util | |
| parent | Merge #16326: [RPC] add new utxoupdatepsbt arguments to the CRPCCommand and C... (diff) | |
| parent | [build]: use #if HAVE_SYSTEM instead of defined(HAVE_SYSTEM) (diff) | |
| download | discoin-f373beebbcc0c7d1160e02dc638a00b3e6831d98.tar.xz discoin-f373beebbcc0c7d1160e02dc638a00b3e6831d98.zip | |
Merge #16344: build: use #if HAVE_SYSTEM instead of defined(HAVE_SYSTEM)
976b034b13d28877aee641833d5ee28a8cc5d83f [build]: use #if HAVE_SYSTEM instead of defined(HAVE_SYSTEM) (Sjors Provoost)
Pull request description:
It seems that `AC_DEFINE([HAVE_SYSTEM], [HAVE_STD__SYSTEM || HAVE_WSYSTEM]` causes `HAVE_SYSTEM` to always be defined, so we need to use `#if HAVE_SYSTEM` instead of `#if defined(HAVE_SYSTEM)`.
Followup for #15457, can be tested with #12557.
ACKs for top commit:
dongcarl:
ACK https://github.com/bitcoin/bitcoin/pull/16344/commits/976b034b13d28877aee641833d5ee28a8cc5d83f.
promag:
ACK 976b034b13d28877aee641833d5ee28a8cc5d83f.
fanquake:
ACK 976b034b13d28877aee641833d5ee28a8cc5d83f
Tree-SHA512: b8cdd04c2ec399fd15638aef5d75ea0886ec1572d3cf4fcea27c193e1e6390344315908262cad8981a9b0a905ab9520619ce2ffe9a717f4ee6bfa8b028ebbdc6
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/system.cpp | 2 | ||||
| -rw-r--r-- | src/util/system.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/util/system.cpp b/src/util/system.cpp index 0f599b85f..61b81d51e 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -1114,7 +1114,7 @@ fs::path GetSpecialFolderPath(int nFolder, bool fCreate) } #endif -#if defined(HAVE_SYSTEM) +#if HAVE_SYSTEM void runCommand(const std::string& strCommand) { if (strCommand.empty()) return; diff --git a/src/util/system.h b/src/util/system.h index fd0583658..dda915648 100644 --- a/src/util/system.h +++ b/src/util/system.h @@ -89,7 +89,7 @@ fs::path GetConfigFile(const std::string& confPath); #ifdef WIN32 fs::path GetSpecialFolderPath(int nFolder, bool fCreate = true); #endif -#if defined(HAVE_SYSTEM) +#if HAVE_SYSTEM void runCommand(const std::string& strCommand); #endif |