diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-01-29 20:28:19 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-01-29 20:28:19 +0100 |
| commit | 89afb970d88e3efa8ddb2f1eafff10cd6525f2b7 (patch) | |
| tree | 206b3ba15c0fc87b3bf9ad7371f73887280945c4 /source/cThread.cpp | |
| parent | VC2008 compilation with new lua webplugin (diff) | |
| download | cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.gz cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.bz2 cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.lz cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.xz cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.zst cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/cThread.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/source/cThread.cpp b/source/cThread.cpp index 4d09907ab..3197fdcd6 100644 --- a/source/cThread.cpp +++ b/source/cThread.cpp @@ -1,17 +1,12 @@ -#ifndef _WIN32
-#include <cstring>
-#include <semaphore.h>
-#include <errno.h>
-#include <pthread.h>
-#else
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#endif
-#include "cThread.h"
-#include "cEvent.h"
-#include "cMCLogger.h"
-#ifdef _WIN32
+#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
+
+
+
+
+
+// When in MSVC, the debugger provides "thread naming" by catching special exceptions. Interface here:
+#ifdef _MSC_VER
//
// Usage: SetThreadName (-1, "MainThread");
//
@@ -39,7 +34,11 @@ void SetThreadName( DWORD dwThreadID, LPCSTR szThreadName) {
}
}
-#endif
+#endif // _MSC_VER
+
+
+
+
cThread::cThread( ThreadFunc a_ThreadFunction, void* a_Param, const char* a_ThreadName /* = 0 */ )
: m_ThreadFunction( a_ThreadFunction )
|