diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-02-22 15:26:01 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-02-22 15:26:01 +0000 |
| commit | 3b25592002f791c91d3a040d0f094f3df32f577e (patch) | |
| tree | c8ed2bd6511f214544f44aaa1265c965f7124a17 | |
| parent | 08277954dc8334d72e31fe0f768855056e282f27 (diff) | |
Now compiles with win32thread and testsuite
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8993 e03df62e-2008-0410-955e-edbf42e46eb7
| -rw-r--r-- | include/threadengines/threadengine_win32.h | 4 | ||||
| -rw-r--r-- | src/testsuite.cpp | 1 | ||||
| -rw-r--r-- | src/threadengines/threadengine_win32.cpp | 2 | ||||
| -rw-r--r-- | win/configure.cpp | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h index 2dd40968e..96a3d25b4 100644 --- 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 7f8a38d54..2396f142c 100644 --- 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 025fcad9b..e426fe373 100644 --- 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 1ca92a054..055e2ed25 100644 --- 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); |