diff options
| author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-21 14:32:40 +0100 |
|---|---|---|
| committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-21 14:32:40 +0100 |
| commit | 779aca60511055832e776ab4a6299a2b7e049a16 (patch) | |
| tree | dfb031e9bd01b25ab0199286cf6e660f26489817 /src/OSSupport | |
| parent | Merge branch 'master' into cmake (diff) | |
| parent | Merge branch 'master', remote-tracking branch 'upstream/master' (diff) | |
| download | cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.gz cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.bz2 cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.lz cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.xz cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.zst cuberite-779aca60511055832e776ab4a6299a2b7e049a16.zip | |
Diffstat (limited to 'src/OSSupport')
| -rw-r--r-- | src/OSSupport/IsThread.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/OSSupport/IsThread.cpp b/src/OSSupport/IsThread.cpp index 7eb114a82..36205bcf1 100644 --- a/src/OSSupport/IsThread.cpp +++ b/src/OSSupport/IsThread.cpp @@ -51,8 +51,8 @@ static void SetThreadName( DWORD dwThreadID, LPCSTR szThreadName) // cIsThread: cIsThread::cIsThread(const AString & iThreadName) : - m_ThreadName(iThreadName), m_ShouldTerminate(false), + m_ThreadName(iThreadName), m_Handle(NULL_HANDLE) { } @@ -144,7 +144,7 @@ bool cIsThread::Wait(void) return (res == WAIT_OBJECT_0); #else // _WIN32 int res = pthread_join(m_Handle, NULL); - m_Handle = NULL; + m_Handle = NULL_HANDLE; #ifdef LOGD // ProtoProxy doesn't have LOGD LOGD("Thread %s finished", m_ThreadName.c_str()); |