This was never supposed to be invoked on /rehash, only startup.. so move it to startu...

[user/henk/code/inspircd.git] / include / threadengines / threadengine_win32.h

diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h
index c426372a9c0c90a69979eb5bf59361ae4d79acba..1915ecc7b4826f790b27dae0a23f0d0dd47505c8 100644 (file)
--- a/include/threadengines/threadengine_win32.h
+++ b/include/threadengines/threadengine_win32.h
@@ -11,10 +11,9 @@
  * ---------------------------------------------------
  */
 
-#ifndef __THREADENGINE_PTHREAD__
-#define __THREADENGINE_PTHREAD__
+#ifndef __THREADENGINE_WIN32THREAD__
+#define __THREADENGINE_WIN32THREAD__
 
-#include <pthread.h>
 #include "inspircd_config.h"
 #include "base.h"
 #include "threadengine.h"
@@ -23,17 +22,19 @@ class InspIRCd;
 
 class CoreExport Win32ThreadEngine : public ThreadEngine
 {
+ protected:
+
+       bool Mutex(bool enable);
+
  public:
 
        Win32ThreadEngine(InspIRCd* Instance);
 
        virtual ~Win32ThreadEngine();
 
-       bool Mutex(bool enable);
-
        void Run();
 
-       static void* Entry(void* parameter);
+       static DWORD WINAPI Entry(void* parameter);
 
        void Create(Thread* thread_to_init);
 
@@ -45,7 +46,7 @@ class CoreExport Win32ThreadEngine : public ThreadEngine
        }
 };
 
-class ThreadEngineFactory : public classbase
+class CoreExport ThreadEngineFactory : public classbase
 {
  public:
        ThreadEngine* Create(InspIRCd* ServerInstance)
@@ -54,5 +55,24 @@ class ThreadEngineFactory : public classbase
        }
 };
 
+class CoreExport Win32Mutex : public Mutex
+{
+ private:
+       CRITICAL_SECTION wutex;
+ public:
+       Win32Mutex(InspIRCd* Instance);
+       virtual void Enable(bool enable);
+       ~Win32Mutex();
+};
+
+class CoreExport MutexFactory : public Extensible
+{
+ protected:
+       InspIRCd* ServerInstance;
+ public:
+       MutexFactory(InspIRCd* Instance);
+       virtual Mutex* CreateMutex();
+};
+
 #endif