summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7>2009-10-11 15:30:59 +0000
committerpeavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7>2009-10-11 15:30:59 +0000
commit16b1b2681aad83e77f54e03124ceae9cb324f91b (patch)
treec424ebf1762b7126c115ea27f9dea119fc774d27
parentc0922e936afb01b23c37940795ffd85a566f356c (diff)
Ugly-ish hack to select SocketEngine on windows until I or someone else finds a better way.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11835 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/socketengines/socketengine_iocp.cpp22
-rw-r--r--src/socketengines/socketengine_select.cpp17
2 files changed, 10 insertions, 29 deletions
diff --git a/src/socketengines/socketengine_iocp.cpp b/src/socketengines/socketengine_iocp.cpp
index 5fe09fe42..17c439c5b 100644
--- a/src/socketengines/socketengine_iocp.cpp
+++ b/src/socketengines/socketengine_iocp.cpp
@@ -11,30 +11,19 @@
* ---------------------------------------------------
*/
-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
- *
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
- *
- * This program is free but copyrighted software; see
- * the file COPYING for details.
- *
- * ---------------------------------------------------
- */
+#include "inspircd_config.h"
+#ifdef CONFIG_USE_IOCP
#ifndef __SOCKETENGINE_IOCP__
#define __SOCKETENGINE_IOCP__
-#define READ_BUFFER_SIZE 600
-#define USING_IOCP 1
-
-#include "inspircd_config.h"
#include "inspircd_win32wrapper.h"
#include "inspircd.h"
#include "socketengine.h"
+#define READ_BUFFER_SIZE 600
+#define USING_IOCP 1
+
/** Socket overlapped event types
*/
enum SocketIOEvent
@@ -761,3 +750,4 @@ SocketEngine* CreateSocketEngine()
{
return new IOCPEngine;
}
+#endif \ No newline at end of file
diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index 98030d9c1..63e8b281b 100644
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -11,22 +11,13 @@
* ---------------------------------------------------
*/
+#include "inspircd_config.h"
+#ifndef CONFIG_USE_IOCP
+
#include "inspircd.h"
#ifndef WINDOWS
#include <sys/select.h>
#endif // WINDOWS
-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
- *
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
- *
- * This program is free but copyrighted software; see
- * the file COPYING for details.
- *
- * ---------------------------------------------------
- */
#ifndef __SOCKETENGINE_SELECT__
#define __SOCKETENGINE_SELECT__
@@ -37,7 +28,6 @@
#ifndef WINDOWS
#include <sys/select.h>
#endif // WINDOWS
-#include "inspircd_config.h"
#include "inspircd.h"
#include "socketengine.h"
@@ -198,3 +188,4 @@ SocketEngine* CreateSocketEngine()
{
return new SelectEngine;
}
+#endif \ No newline at end of file