Purge code for Windows XP and MSVC pre-2015.

[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 79f1b36351cc5fe3120a9698d8ffbf2ab62bae37..42f634db18c35aa9c9db22f27b76261c6496b6e8 100644 (file)
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -20,7 +20,6 @@
 
 
 #include "inspircd.h"
-#include "socketengine.h"
 
 #ifndef _WIN32
 #include <sys/select.h>
@@ -111,7 +110,9 @@ void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
 
 int SocketEngine::DispatchEvents()
 {
-       static timeval tval = { 1, 0 };
+       timeval tval;
+       tval.tv_sec = 1;
+       tval.tv_usec = 0;
 
        fd_set rfdset = ReadSet, wfdset = WriteSet, errfdset = ErrSet;
 
@@ -140,26 +141,24 @@ int SocketEngine::DispatchEvents()
                        if (getsockopt(i, SOL_SOCKET, SO_ERROR, (char*)&errcode, &codesize) < 0)
                                errcode = errno;
 
-                       ev->HandleEvent(EVENT_ERROR, errcode);
+                       ev->OnEventHandlerError(errcode);
                        continue;
                }
 
                if (has_read)
                {
-                       stats.ReadEvents++;
                        ev->SetEventMask(ev->GetEventMask() & ~FD_READ_WILL_BLOCK);
-                       ev->HandleEvent(EVENT_READ);
+                       ev->OnEventHandlerRead();
                        if (ev != GetRef(i))
                                continue;
                }
 
                if (has_write)
                {
-                       stats.WriteEvents++;
                        int newmask = (ev->GetEventMask() & ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE));
                        SocketEngine::OnSetEvent(ev, ev->GetEventMask(), newmask);
                        ev->SetEventMask(newmask);
-                       ev->HandleEvent(EVENT_WRITE);
+                       ev->OnEventHandlerWrite();
                }
        }