Removed __single_client_alloc again because gcc devs were smoking crack and removed it

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 9a71c3a920b0a9d48f67bb59a9edf135fc7d1c8b..4464be7559dbab30c4a8bd7b1891baceb3f39f51 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -32,7 +32,6 @@ using namespace std;
 #include <sys/event.h>
 #include <sys/time.h>
 #endif
-#include <cstdio>
 #include <time.h>
 #include <string>
 #ifdef GCC3
@@ -43,10 +42,7 @@ using namespace std;
 #include <map>
 #include <sstream>
 #include <vector>
-#include <errno.h>
 #include <deque>
-#include <errno.h>
-#include <unistd.h>
 #include <sched.h>
 #include "connection.h"
 #include "users.h"
@@ -111,10 +107,10 @@ time_t TIME = time(NULL), OLDTIME = time(NULL);
 int kq, lkq, skq;
 #endif
 
-typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, StrHashComp> user_hash;
-typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, StrHashComp> chan_hash;
-typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, InAddr_HashComp> address_cache;
-typedef nspace::hash_map<std::string, WhoWasUser*, nspace::hash<string>, StrHashComp> whowas_hash;
+typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, irc::StrHashComp> user_hash;
+typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, irc::StrHashComp> chan_hash;
+typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, irc::InAddr_HashComp> address_cache;
+typedef nspace::hash_map<std::string, WhoWasUser*, nspace::hash<string>, irc::StrHashComp> whowas_hash;
 typedef std::deque<command_t> command_table;
 
 // This table references users by file descriptor.