X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fthread.h;h=60a2e83e7154096524c2583e7eccfe57f8cc5c30;hp=937d161938b20aad593653bbe99ed882aeb77156;hb=521cf1db00f8ce2d9f9494dca503d6c17d89ac2f;hpb=80bbee2f401b4af71cb1b80508bdb0d2bb61fa40

diff --git a/source/core/thread.h b/source/core/thread.h
index 937d161..60a2e83 100644
--- a/source/core/thread.h
+++ b/source/core/thread.h
@@ -1,10 +1,11 @@
-/*
+/* $Id$
+
 This file is part of libmspcore
 Copyright © 2006 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
-#ifndef MSP_FRAMEWORK_THREAD_H_
-#define MSP_FRAMEWORK_THREAD_H_
+#ifndef MSP_CORE_THREAD_H_
+#define MSP_CORE_THREAD_H_
 
 #include "types.h"
 
@@ -36,13 +37,13 @@ private:
 	Thread(const Thread &);
 	Thread &operator=(const Thread &);
 
+	static
 #ifdef WIN32
-#	define THREAD_RETURN_ DWORD WINAPI
+	DWORD WINAPI
 #else
-#	define THREAD_RETURN_ void *
+	void *
 #endif
-	static THREAD_RETURN_ main_(void *t) { ((Thread *)t)->main(); return 0; }
-#undef THREAD_RETURN_
+	main_(void *t) { ((Thread *)t)->main(); return 0; }
 };
 
 } // namespace Msp