Merge branch 'cpp-11' into crashlog_improvements

# Conflicts:
#	Makefile.src.in
#	projects/determineversion.vbs
#	source.list
#	src/crashlog.cpp
#	src/misc.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rev.h
#	src/thread/thread.h
#	src/thread/thread_morphos.cpp
#	src/thread/thread_none.cpp
#	src/thread/thread_os2.cpp
#	src/thread/thread_pthread.cpp
#	src/thread/thread_win32.cpp

src/os/os2/os2.cpp

@@ -18,6 +18,7 @@
 #include "../../core/random_func.hpp"
 #include "../../string_func.h"
 #include "../../textbuf_gui.h"
+#include "../../thread.h"
 
 #include "table/strings.h"
 
@@ -204,25 +205,22 @@ bool GetClipboardContents(char *buffer, const char *last)
 }
 
 
-void CSleep(int milliseconds)
-{
-#ifndef __INNOTEK_LIBC__
-	delay(milliseconds);
-#else
-	usleep(milliseconds * 1000);
-#endif
-}
-
 const char *FS2OTTD(const char *name) {return name;}
 const char *OTTD2FS(const char *name) {return name;}
 
-uint GetCPUCoreCount()
-{
-	return 1;
-}
-
 void OSOpenBrowser(const char *url)
 {
 	// stub only
 	DEBUG(misc, 0, "Failed to open url: %s", url);
 }
+
+void SetCurrentThreadName(const char *)
+{
+}
+
+int GetCurrentThreadName(char *str, const char *last) { return 0; }
+
+void SetSelfAsMainThread() { }
+
+bool IsMainThread() { return false; }
+bool IsNonMainThread() { return false; }