diff options
| author | Wladimir J. van der Laan <[email protected]> | 2011-10-09 20:26:40 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2011-10-09 20:26:40 +0200 |
| commit | 8828da5f56313855e19f463ff1c09196812b997b (patch) | |
| tree | e54e27b1a7d5287bbe245189c3044cc1a19ba02b /src/init.cpp | |
| parent | Edited doc/readme-qt.rst via GitHub (diff) | |
| parent | Merge pull request #573 from luke-jr/bugfix_bits_string (diff) | |
| download | discoin-8828da5f56313855e19f463ff1c09196812b997b.tar.xz discoin-8828da5f56313855e19f463ff1c09196812b997b.zip | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/init.cpp b/src/init.cpp index f09e1d019..28be7ef7c 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -24,7 +24,7 @@ CWallet* pwalletMain; void ExitTimeout(void* parg) { -#ifdef __WXMSW__ +#ifdef WIN32 Sleep(5000); ExitProcess(0); #endif @@ -121,10 +121,10 @@ bool AppInit2(int argc, char* argv[]) // Disable confusing "helpful" text message on abort, ctrl-c _set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT); #endif -#ifndef __WXMSW__ +#ifndef WIN32 umask(077); #endif -#ifndef __WXMSW__ +#ifndef WIN32 // Clean shutdown on SIGTERM struct sigaction sa; sa.sa_handler = HandleSIGTERM; @@ -192,7 +192,7 @@ bool AppInit2(int argc, char* argv[]) #ifdef GUI " -server \t\t " + _("Accept command line and JSON-RPC commands\n") + #endif -#ifndef __WXMSW__ +#ifndef WIN32 " -daemon \t\t " + _("Run in the background as a daemon and accept commands\n") + #endif " -testnet \t\t " + _("Use the test network\n") + @@ -225,7 +225,7 @@ bool AppInit2(int argc, char* argv[]) fDebug = GetBoolArg("-debug"); fAllowDNS = GetBoolArg("-dns"); -#ifndef __WXMSW__ +#ifndef WIN32 fDaemon = GetBoolArg("-daemon"); #else fDaemon = false; @@ -260,7 +260,7 @@ bool AppInit2(int argc, char* argv[]) } #endif -#ifndef __WXMSW__ +#ifndef WIN32 if (fDaemon) { // Daemonize |