Route some more stuff through socket.h and hash_map.h. Add #define protection to timer.h and remove some unneeded includes and externs from timer.cpp

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

1 files changed, 2 insertions, 17 deletions

diff --git a/include/inspsocket.h b/include/inspsocket.h
index caa1490b5..c9cc70acf 100644
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -17,27 +17,12 @@
 #ifndef __INSP_SOCKET_H__
 #define __INSP_SOCKET_H__
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <sstream>
 #include <string>
 #include <deque>
-#include "dns.h"
 #include "inspircd_config.h"
-
-/* macros to the relevant system address description structs */
-#ifdef IPV6
-
-typedef struct sockaddr_in6 insp_sockaddr;
-typedef struct in6_addr     insp_inaddr;
-
-#else
-
-typedef struct sockaddr_in  insp_sockaddr;
-typedef struct in_addr      insp_inaddr;
-
-#endif
+#include "dns.h"
+#include "socket.h"
 
 /**
  * States which a socket may be in