summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-02-22 15:15:33 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-02-22 15:15:33 +0000
commit08277954dc8334d72e31fe0f768855056e282f27 (patch)
tree4874c5564bc4310004d67c071e9f4dca6e7fd763
parenta0369fc40d272bba0ce9e8350ae6c38d7bc0c1fa (diff)
Closer to compilation
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8992 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--include/threadengines/threadengine_win32.h1
-rw-r--r--src/testsuite.cpp1
-rw-r--r--src/threadengines/threadengine_win32.cpp5
3 files changed, 3 insertions, 4 deletions
diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h
index 696948d19..2dd40968e 100644
--- a/include/threadengines/threadengine_win32.h
+++ b/include/threadengines/threadengine_win32.h
@@ -14,7 +14,6 @@
#ifndef __THREADENGINE_PTHREAD__
#define __THREADENGINE_PTHREAD__
-#include <pthread.h>
#include "inspircd_config.h"
#include "base.h"
#include "threadengine.h"
diff --git a/src/testsuite.cpp b/src/testsuite.cpp
index 2396f142c..7f8a38d54 100644
--- a/src/testsuite.cpp
+++ b/src/testsuite.cpp
@@ -13,6 +13,7 @@
/* $Core: libIRCDtestsuite */
+#include "inspircd_config.h"
#include "inspircd.h"
#include "testsuite.h"
#include "threadengine.h"
diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp
index b2279ee2f..025fcad9b 100644
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -13,7 +13,6 @@
#include "inspircd.h"
#include "threadengines/threadengine_win32.h"
-#include <pthread.h>
CRITICAL_SECTION MyMutex;
@@ -26,10 +25,10 @@ void Win32ThreadEngine::Create(Thread* thread_to_init)
HANDLE* MyThread = new HANDLE;
DWORD ThreadId = 0;
- if (!(MyThread = CreateThread(NULL,0,Win32ThreadEngine::Entry,this,0,&ThreadId)))
+ if (!(*MyThread = CreateThread(NULL,0,Win32ThreadEngine::Entry,this,0,&ThreadId)))
{
delete MyThread;
- throw CoreException("Unable to reate new Win32ThreadEngine: " + dlerror());
+ throw CoreException(std::string("Unable to reate new Win32ThreadEngine: ") + dlerror());
}
NewThread = thread_to_init;