Merge branch 'cpp-11' into crashlog_improvements

# Conflicts: # config.lib
2017-09-04 01:22:54 +01:00
parent 2f85326a4a 509e20406f
commit 4a6ddb2d50
301 changed files with 6351 additions and 4178 deletions
--- a/src/thread/thread_none.cpp
+++ b/src/thread/thread_none.cpp
@@ -14,7 +14,7 @@

 #include "../safeguards.h"

-/* static */ bool ThreadObject::New(OTTDThreadFunc proc, void *param, ThreadObject **thread)
+/* static */ bool ThreadObject::New(OTTDThreadFunc proc, void *param, ThreadObject **thread, const char *name)
 {
 	if (thread != NULL) *thread = NULL;
 	return false;