diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-07-05 17:21:42 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-07-05 17:33:33 +0200 |
| commit | 8c69fae94410f54bad13be0f34d54370fddbf4b3 (patch) | |
| tree | 9138baf67dd2b51b3b22deff1504794b467e8af6 /src/util | |
| parent | 4f378ac30cf66178564620b4a8ca9cad7f031cc3 (diff) | |
| parent | f874e14cd3c84cd412bd3fb42b3ee1706ca6a267 (diff) | |
| download | bitcoin-8c69fae94410f54bad13be0f34d54370fddbf4b3.tar.xz | |
Merge #15457: Check std::system for -[alert|block|wallet]notify
f874e14cd3c84cd412bd3fb42b3ee1706ca6a267 [build]: check std::system for -[alert|block|wallet]notify (Sjors Provoost)
cc3ad56ff2bc2583fe68c4a9e0b41072a47c0b07 [build] MSVC: set HAVE_SYSTEM for desktop apps (Sjors Provoost)
c1c91bb78d7267f01ee3a3c156c218b46a92cd39 [build] detect std::system or ::wsystem (Sjors Provoost)
Pull request description:
Platforms such as iOs and Universal Windows Platform do not support launching a process through system().
ACKs for top commit:
laanwj:
code review ACK f874e14cd3c84cd412bd3fb42b3ee1706ca6a267
Tree-SHA512: 16bb4a8fa1896046ccb22a46c8985e1aa45f5b11ecf5539eb2299e9a58f1a5b085c0c12cb6939c7493d93abce7e84fadcbfc73374c887db63da6d00c08aa476d
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/system.cpp | 2 | ||||
| -rw-r--r-- | src/util/system.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/util/system.cpp b/src/util/system.cpp index 87ff6e62ba..0f599b85f1 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -1114,6 +1114,7 @@ fs::path GetSpecialFolderPath(int nFolder, bool fCreate) } #endif +#if defined(HAVE_SYSTEM) void runCommand(const std::string& strCommand) { if (strCommand.empty()) return; @@ -1125,6 +1126,7 @@ void runCommand(const std::string& strCommand) if (nErr) LogPrintf("runCommand error: system(%s) returned %d\n", strCommand, nErr); } +#endif void SetupEnvironment() { diff --git a/src/util/system.h b/src/util/system.h index 15d7b1b402..fd0583658b 100644 --- a/src/util/system.h +++ b/src/util/system.h @@ -89,7 +89,9 @@ fs::path GetConfigFile(const std::string& confPath); #ifdef WIN32 fs::path GetSpecialFolderPath(int nFolder, bool fCreate = true); #endif +#if defined(HAVE_SYSTEM) void runCommand(const std::string& strCommand); +#endif /** * Most paths passed as configuration arguments are treated as relative to |