X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fthread.h;h=59e6e060ce4b77d2e0e69b45f245e6537ca3a70b;hb=a1d6fa071280123f282c1bac3b68008672401024;hp=937d161938b20aad593653bbe99ed882aeb77156;hpb=fe77fc6b869a71bf94d501a0762579f4ddbc5094;p=libs%2Fcore.git

diff --git a/source/core/thread.h b/source/core/thread.h
index 937d161..59e6e06 100644
--- a/source/core/thread.h
+++ b/source/core/thread.h
@@ -1,12 +1,12 @@
-/*
+/* $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_
 
-#include "types.h"
+#ifndef MSP_CORE_THREAD_H_
+#define MSP_CORE_THREAD_H_
 
 namespace Msp {
 
@@ -19,30 +19,25 @@ is started.
 */
 class Thread
 {
-public:
-	void join();
-	void cancel();
-	void kill();
-	virtual ~Thread();
-protected:
-	Thread(): launched_(false) { }
-	void launch();
-	virtual void main()=0;
-	void check_cancel();
 private:
-	ThreadHandle thread_;
-	bool         launched_;
+	struct Private;
 
+	Private *priv_;
+	bool launched_;
+
+protected:
+	Thread();
+private:
 	Thread(const Thread &);
 	Thread &operator=(const Thread &);
+public:
+	virtual ~Thread();
 
-#ifdef WIN32
-#	define THREAD_RETURN_ DWORD WINAPI
-#else
-#	define THREAD_RETURN_ void *
-#endif
-	static THREAD_RETURN_ main_(void *t) { ((Thread *)t)->main(); return 0; }
-#undef THREAD_RETURN_
+	void join();
+	void kill();
+protected:
+	void launch();
+	virtual void main() = 0;
 };
 
 } // namespace Msp