flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed ProtoProxy compilation, added client Kick handling.

Browse Source
This commit is contained in:
madmaxoft
2013-08-25 21:57:12 +02:00
parent 6ea7c2b772
commit ebc076e8b2
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/OSSupport/IsThread.cpp
View File

@@ -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