Replacement of bzero with memset for solaris 10 compat.

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 20b924013eeaa0a14f8a5b7e01e3c80265b54bac..703705f232a23dce97d6ff99c2a66cd04ff59b99 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
@@ -48,8 +50,6 @@
 #include "helperfuncs.h"
 #include "hashcomp.h"
 
-using namespace std;
-
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 
@@ -78,8 +78,8 @@ extern std::vector<userrec*> all_opers;
 
 extern ClassVector Classes;
 
-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<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 std::deque<command_t> command_table;
 
 extern user_hash clientlist;
@@ -420,7 +420,7 @@ void WriteCommon(userrec *u, char* text, ...)
         va_end(argsPtr);
 
         // FIX: Stops a message going to the same person more than once
-        bzero(&already_sent,65536);
+        memset(&already_sent,0,65536);
 
         bool sent_to_at_least_one = false;
 
@@ -472,7 +472,7 @@ void WriteCommonExcept(userrec *u, char* text, ...)
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
 
-        bzero(&already_sent,65536);
+        memset(&already_sent,0,65536);
 
         for (int i = 0; i < MAXCHANS; i++)
         {