Fix compile errors in windows

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7592 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/socketengine_iocp.h b/include/socketengine_iocp.h
index f4825c6b46c7aeb5c29b9e7ff403eaa647f6f6cd..ad3e581574015c13b2d30a0bd3027bafd710d563 100644 (file)
--- a/include/socketengine_iocp.h
+++ b/include/socketengine_iocp.h
@@ -114,6 +114,11 @@ class IOCPEngine : public SocketEngine
        map<int, EventHandler*> m_binding;
 
 public:
+       /** Holds the preallocated buffer passed to WSARecvFrom
+        * function. Yes, I know, it's a dirty hack.
+        */
+       udp_overlap * udp_ov;
+
        /** Creates an IOCP Socket Engine
         * @param Instance The creator of this object
         */
@@ -206,10 +211,7 @@ public:
         */
        EventHandler* GetIntRef(int fd);
 
-       /** Holds the preallocated buffer passed to WSARecvFrom
-        * function. Yes, I know, it's a dirty hack.
-        */
-       udp_overlap * udp_ov;
+       bool BoundsCheckFd(EventHandler* eh);
 };
 
 /** Creates a SocketEngine

diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp
index 37d0714595922c30ecabe9450666fcbc58e2780c..0e7f0172e8b9fd1fbe9ffed64641196a73414025 100644 (file)
--- a/win/inspircd_win32wrapper.cpp
+++ b/win/inspircd_win32wrapper.cpp
@@ -366,7 +366,7 @@ int getopt_long_only(int ___argc, char *const *___argv, const char *__shortopts,
 #define IPC_MESSAGE_DIE                2
 #define IPC_MESSAGE_RESTART    3
 
-void InitIPC()
+void IPC::IPC(InspIRCd* Srv) : Instance(Srv)
 {
        static DWORD buflen = 1024;
        static const char * pipename = "\\\\.\\mailslot\\Inspircd";
@@ -375,7 +375,7 @@ void InitIPC()
                printf("IPC Pipe could not be created. Are you sure you didn't start InspIRCd twice?\n");
 }
 
-void CheckIPC(InspIRCd * Instance)
+void IPC::Check()
 {
        if (hIPCPipe == INVALID_HANDLE_VALUE)
                return;
@@ -407,7 +407,7 @@ void CheckIPC(InspIRCd * Instance)
        }
 }
 
-void CloseIPC()
+void IPC::~IPC()
 {
        CloseHandle(hIPCPipe);
 }
@@ -643,6 +643,3 @@ bool ValidateWindowsDnsServer(ServerConfig* conf, const char* tag, const char* v
        }
        return true;
 }
-
-#else
-

diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h
index dcb0b1d396d418d7117026b34acf0e3e0fd0da50..3f412db556d5a221022c4e4d07c2c6166e0078be 100644 (file)
--- a/win/inspircd_win32wrapper.h
+++ b/win/inspircd_win32wrapper.h
@@ -174,8 +174,8 @@ void ::operator delete(void * ptr);
 
 /* IPC Handlers */
 class InspIRCd;
-class ConfigReader;
 class ValueItem;
+class ServerConfig;
 
 class IPC
 {
@@ -183,9 +183,9 @@ class IPC
        InspIRCd* Instance;
        HANDLE hIPCPipe;
  public:
-       void IPC();
-       void CheckIPC(InspIRCd* Srv);
-       void ~IPC();
+       IPC(InspIRCd* Srv);
+       void Check();
+       ~IPC();
 };
 
 /* Look up the nameserver in use from the registry on windows */