Remove m_sqlv2.h from these modules, they both use v3 now.

[user/henk/code/inspircd.git] / src / threadengines / threadengine_win32.cpp

diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp
index e880d597f71b367f16cf8ed4548923c8bdf5363a..b2a4dcacac0b50eab18e43e94815a31037f36609 100644 (file)
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.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
@@ -65,6 +65,11 @@ class ThreadSignalSocket : public BufferedSocket
                recvq.clear();
                parent->OnNotify();
        }
+
+       void OnError(BufferedSocketError)
+       {
+               ServerInstance->GlobalCulls.AddItem(this);
+       }
 };
 
 SocketThread::SocketThread()
@@ -76,21 +81,21 @@ SocketThread::SocketThread()
        if (connFD == -1)
                throw CoreException("Could not create ITC pipe");
 
-       if (!SI->BindSocket(listenFD, 0, "127.0.0.1", true))
+       if (!ServerInstance->BindSocket(listenFD, 0, "127.0.0.1", true))
                throw CoreException("Could not create ITC pipe");
-       SI->SE->NonBlocking(connFD);
+       ServerInstance->SE->NonBlocking(connFD);
 
        struct sockaddr_in addr;
        socklen_t sz = sizeof(addr);
        getsockname(listenFD, reinterpret_cast<struct sockaddr*>(&addr), &sz);
        connect(connFD, reinterpret_cast<struct sockaddr*>(&addr), sz);
-       int nfd = accept(listenFD);
+       int nfd = accept(listenFD, reinterpret_cast<struct sockaddr*>(&addr), (int*)sz);
        if (nfd < 0)
                throw CoreException("Could not create ITC pipe");
-       new ThreadSignalSocket(parent, nfd);
+       new ThreadSignalSocket(this, nfd);
        closesocket(listenFD);
 
-       SI->SE->Blocking(connFD);
+       ServerInstance->SE->Blocking(connFD);
        this->signal.connFD = connFD;
 }