diff options
| author | Gavin Andresen <[email protected]> | 2013-04-03 18:25:00 -0700 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2013-04-03 18:25:00 -0700 |
| commit | a0a437c86ae404152de883ac6a1463e6641eda1c (patch) | |
| tree | e99240bd446613584b20c7b9762af5711bf3f7ff /src/util.cpp | |
| parent | Merge pull request #2453 from sipa/txstats (diff) | |
| parent | Have Qt poll for shutdown requested, the QT way. (diff) | |
| download | discoin-a0a437c86ae404152de883ac6a1463e6641eda1c.tar.xz discoin-a0a437c86ae404152de883ac6a1463e6641eda1c.zip | |
Merge pull request #2357 from gavinandresen/shutdowncleanup
Thread / shutdown cleanup
Diffstat (limited to 'src/util.cpp')
| -rw-r--r-- | src/util.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/util.cpp b/src/util.cpp index fc3e846a6..9f5e08a14 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -73,8 +73,6 @@ bool fDebug = false; bool fDebugNet = false; bool fPrintToConsole = false; bool fPrintToDebugger = false; -volatile bool fRequestShutdown = false; -bool fShutdown = false; bool fDaemon = false; bool fServer = false; bool fCommandLine = false; @@ -1431,9 +1429,12 @@ void RenameThread(const char* name) // removed. pthread_set_name_np(pthread_self(), name); -// This is XCode 10.6-and-later; bring back if we drop 10.5 support: -// #elif defined(MAC_OSX) -// pthread_setname_np(name); +#elif defined(MAC_OSX) && defined(__MAC_OS_X_VERSION_MAX_ALLOWED) + +// pthread_setname_np is XCode 10.6-and-later +#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 + pthread_setname_np(name); +#endif #else // Prevent warnings for unused parameters... |