diff options
| author | madmaxoft <github@xoft.cz> | 2013-08-25 21:57:12 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-08-25 21:57:12 +0200 |
| commit | ebc076e8b2abc6b33ebd6fb872c8edf6b6af7089 (patch) | |
| tree | 6ac5c987b85337d04766e2d3999a19201a97ec64 /source/OSSupport | |
| parent | Reduced LeakFinder's stack buffers to half. (diff) | |
| download | cuberite-ebc076e8b2abc6b33ebd6fb872c8edf6b6af7089.tar cuberite-ebc076e8b2abc6b33ebd6fb872c8edf6b6af7089.tar.gz cuberite-ebc076e8b2abc6b33ebd6fb872c8edf6b6af7089.tar.bz2 cuberite-ebc076e8b2abc6b33ebd6fb872c8edf6b6af7089.tar.lz cuberite-ebc076e8b2abc6b33ebd6fb872c8edf6b6af7089.tar.xz cuberite-ebc076e8b2abc6b33ebd6fb872c8edf6b6af7089.tar.zst cuberite-ebc076e8b2abc6b33ebd6fb872c8edf6b6af7089.zip | |
Diffstat (limited to 'source/OSSupport')
| -rw-r--r-- | source/OSSupport/IsThread.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/source/OSSupport/IsThread.cpp b/source/OSSupport/IsThread.cpp index 1fadb3769..d5fbfcf19 100644 --- a/source/OSSupport/IsThread.cpp +++ b/source/OSSupport/IsThread.cpp @@ -136,17 +136,28 @@ bool cIsThread::Wait(void) { return true; } - LOGD("Waiting for thread %s to finish", m_ThreadName.c_str()); + + #ifdef LOGD // ProtoProxy doesn't have LOGD + LOGD("Waiting for thread %s to finish", m_ThreadName.c_str()); + #endif // LOGD #ifdef _WIN32 int res = WaitForSingleObject(m_Handle, INFINITE); m_Handle = NULL; - LOGD("Thread %s finished", m_ThreadName.c_str()); + + #ifdef LOGD // ProtoProxy doesn't have LOGD + LOGD("Thread %s finished", m_ThreadName.c_str()); + #endif // LOGD + return (res == WAIT_OBJECT_0); #else // _WIN32 int res = pthread_join(m_Handle, NULL); m_Handle = NULL; - LOGD("Thread %s finished", m_ThreadName.c_str()); + + #ifdef LOGD // ProtoProxy doesn't have LOGD + LOGD("Thread %s finished", m_ThreadName.c_str()); + #endif // LOGD + m_HasStarted = false; return (res == 0); #endif // else _WIN32 |