summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/threadengine.h18
-rw-r--r--include/threadengines/threadengine_win32.h4
2 files changed, 9 insertions, 13 deletions
diff --git a/include/threadengine.h b/include/threadengine.h
index e1400eb95..c11f2d817 100644
--- a/include/threadengine.h
+++ b/include/threadengine.h
@@ -20,6 +20,12 @@
#include "inspircd_config.h"
#include "base.h"
+#ifdef WINDOWS
+#include "threadengines/threadengine_win32.h"
+#endif
+
+class ThreadData;
+
/** Derive from this class to implement your own threaded sections of
* code. Be sure to keep your code thread-safe and not prone to deadlocks
* and race conditions if you MUST use threading!
@@ -49,17 +55,7 @@ class CoreExport Thread : public Extensible
{
}
- /** If this thread has a Creator set, call it to
- * free the thread
- */
- virtual ~Thread()
- {
- if (state)
- {
- state->FreeThread(this);
- delete state;
- }
- }
+ virtual ~Thread();
/** Override this method to put your actual
* threaded code here.
diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h
index 0fc9b27bc..6bd1c2c00 100644
--- a/include/threadengines/threadengine_win32.h
+++ b/include/threadengines/threadengine_win32.h
@@ -77,7 +77,7 @@ class CoreExport Mutex
private:
CRITICAL_SECTION wutex;
public:
- Win32Mutex()
+ Mutex()
{
InitializeCriticalSection(&wutex);
}
@@ -89,7 +89,7 @@ class CoreExport Mutex
{
LeaveCriticalSection(&wutex);
}
- ~Win32Mutex()
+ ~Mutex()
{
DeleteCriticalSection(&wutex);
}