Now compiles with win32thread and testsuite

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8993 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h
index 2dd40968e7e376891f6b1e9dcfd0278376bb78a3..96a3d25b410d0a127bec1ed60a5fd379204674d1 100644 (file)
--- a/include/threadengines/threadengine_win32.h
+++ b/include/threadengines/threadengine_win32.h
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __THREADENGINE_PTHREAD__
-#define __THREADENGINE_PTHREAD__
+#ifndef __THREADENGINE_WIN32THREAD__
+#define __THREADENGINE_WIN32THREAD__
 
 #include "inspircd_config.h"
 #include "base.h"

diff --git a/src/testsuite.cpp b/src/testsuite.cpp
index 7f8a38d54eb3981226c6f60e0f4e4e212525c7ba..2396f142c4a57ce76359340afa2e434e0134d575 100644 (file)
--- a/src/testsuite.cpp
+++ b/src/testsuite.cpp
@@ -13,7 +13,6 @@
 
 /* $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 025fcad9bb3aedb0d24e26b9a297a25463e8ac41..e426fe37383eb6ece91b263a3fb3157ef7405d00 100644 (file)
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -68,8 +68,6 @@ void Win32ThreadEngine::FreeThread(Thread* thread)
        if (thread->GetExt("winthread", winthread))
        {
                thread->SetExitFlag();
-               int rc;
-               void* status;
                WaitForSingleObject(*winthread,INFINITE);
                delete winthread;
        }

diff --git a/win/configure.cpp b/win/configure.cpp
index 1ca92a054e1a3d483a2ed1d0ff1115c875753dd9..055e2ed256f1c55b311f45b20543bb2693c4b873 100644 (file)
--- a/win/configure.cpp
+++ b/win/configure.cpp
@@ -395,6 +395,7 @@ void Run()
        fprintf(f, "#define MAXBUF 514\n");
 
        fprintf(f, "\n#include \"inspircd_win32wrapper.h\"\n\n");
+       fprintf(f, "#include \"threadengines/threadengine_win32.h\"\n\n");
        fprintf(f, "#endif\n\n");
        fclose(f);
 
@@ -406,7 +407,6 @@ void Run()
        fprintf(f, "#ifndef __CONFIGURATION_SOCKETENGINE__\n");
        fprintf(f, "#define __CONFIGURATION_SOCKETENGINE__\n\n");
        fprintf(f, "#include \"socketengines/socketengine_%s.h\"\n\n", use_iocp ? "iocp" : "select");
-       fprintf(f, "#include \"threadengines/threadengine_win32.h\"\n\n");
        fprintf(f, "#endif\n\n");
        fclose(f);