Change more modules to VF_OPTCOMMON and assert identical charsets in m_nationalchars

[user/henk/code/inspircd.git] / src / socketengines / socketengine_select.cpp

diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index 63e8b281b0ae5f6dffc67fafeb378ea3b4b4d552..7bff4ff6d08faede3f31a59d5dcad748490e6990 100644 (file)
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,24 +12,13 @@
  */
 
 #include "inspircd_config.h"
-#ifndef CONFIG_USE_IOCP
 
 #include "inspircd.h"
-#ifndef WINDOWS
-#include <sys/select.h>
-#endif // WINDOWS
-
-#ifndef __SOCKETENGINE_SELECT__
-#define __SOCKETENGINE_SELECT__
+#include "socketengine.h"
 
-#include <vector>
-#include <string>
-#include <map>
 #ifndef WINDOWS
 #include <sys/select.h>
 #endif // WINDOWS
-#include "inspircd.h"
-#include "socketengine.h"
 
 /** A specialisation of the SocketEngine class, designed to use traditional select().
  */
@@ -49,10 +38,6 @@ public:
        virtual std::string GetName();
 };
 
-#endif
-
-
-
 SelectEngine::SelectEngine()
 {
        MAX_DESCRIPTORS = FD_SETSIZE;
@@ -115,7 +100,7 @@ int SelectEngine::DispatchEvents()
        FD_ZERO(&rfdset);
        FD_ZERO(&errfdset);
 
-       /* Populate the select FD sets (this is why select sucks compared to epoll, kqueue, IOCP) */
+       /* Populate the select FD sets (this is why select sucks compared to epoll, kqueue) */
        for (unsigned int i = 0; i < FD_SETSIZE; i++)
        {
                EventHandler* eh = ref[i];
@@ -188,4 +173,3 @@ SocketEngine* CreateSocketEngine()
 {
        return new SelectEngine;
 }
-#endif
\ No newline at end of file