Merge in patch by Darom that fixes race condition when unloading m_mysql.so that...

[user/henk/code/inspircd.git] / include / inspsocket.h

diff --git a/include/inspsocket.h b/include/inspsocket.h
index fd5d4dd18c47f1ff1fbe97b44713950896db1726..d33cde5e82752229e30a18afde7ffff7d0193e5c 100644 (file)
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -14,13 +14,6 @@
 #ifndef __INSP_SOCKET_H__
 #define __INSP_SOCKET_H__
 
-#include <sstream>
-#include <string>
-#include <deque>
-#include "dns.h"
-#include "inspircd_config.h"
-#include "socket.h"
-#include "inspsocket.h"
 #include "timer.h"
 
 /**
@@ -325,7 +318,7 @@ class CoreExport BufferedSocket : public EventHandler
         * into a char* array which can be up to
         * 16 kilobytes in length.
         */
-       virtual char* Read();
+       virtual const char* Read();
 
        /**
         * Returns the IP address associated with