diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:16:40 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:19:48 +0000 |
| commit | cafa8f2879c255c4526709e77b3e42c5b2533b5e (patch) | |
| tree | 616fe57c52df382e48341f595871ff43721ea90c /src/init.cpp | |
| parent | 89c5c381b7e8e29da361e1bf647010ad94e5fea0 (diff) | |
| parent | 982f4fd301435e56bb959267a8f69ff793b10e26 (diff) | |
| download | bitcoin-cafa8f2879c255c4526709e77b3e42c5b2533b5e.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/key.h
src/keystore.h
src/net.h
src/protocol.cpp
src/qt/guiutil.h
src/test/DoS_tests.cpp
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp index 6e1c0c5d35..27e709a6ea 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -79,7 +79,7 @@ void Shutdown(void* parg) printf("Bitcoin exiting\n\n"); fExit = true; #ifndef QT_GUI - // ensure non UI client get's exited here, but let Bitcoin-Qt reach return 0; in bitcoin.cpp + // ensure non-UI client get's exited here, but let Bitcoin-Qt reach return 0; in bitcoin.cpp exit(0); #endif } @@ -139,12 +139,12 @@ bool AppInit(int argc, char* argv[]) bool AppInit2(int argc, char* argv[]) { #ifdef _MSC_VER - // Turn off microsoft heap dump noise + // Turn off Microsoft heap dump noise _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE); _CrtSetReportFile(_CRT_WARN, CreateFileA("NUL", GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0)); #endif #if _MSC_VER >= 1400 - // Disable confusing "helpful" text message on abort, ctrl-c + // Disable confusing "helpful" text message on abort, Ctrl-C _set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT); #endif #ifndef WIN32 |