fixed some collisions with older commits

diff --git a/include/s_user.h b/include/s_user.h
index 78035035da577ef33e271961781d71592f054d9c..970e45bc358c517326c424a21d456bf0f3ed3806 100644 (file)
--- a/include/s_user.h
+++ b/include/s_user.h
@@ -75,8 +75,6 @@ extern int set_nick_name(struct Client* cptr, struct Client* sptr,
                          const char* nick, int parc, char* parv[], unsigned int force);
 extern void send_umode_out(struct Client* cptr, struct Client* sptr,
                           struct Flags* old, int prop);
-extern void send_umode(struct Client *cptr, struct Client *sptr, struct Flags *old,
-                       int sendset);
 extern int whisper(struct Client* source, const char* nick,
                    const char* channel, const char* text, int is_notice);
 extern void send_user_info(struct Client* to, char* names, int rpl,

diff --git a/ircd/m_quit.c b/ircd/m_quit.c
index 20b8224145f2bff5a9a8224a1ddd60eed8df33a1..9c06b31ccc78d29684a9622f9c2f20ebbff76eba 100644 (file)
--- a/ircd/m_quit.c
+++ b/ircd/m_quit.c
@@ -105,7 +105,7 @@ int m_quit(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   assert(0 != sptr);
   assert(cptr == sptr);
 
-  if (!irc_strcmp(parv[parc - 1], "ZOMBIE")) {
+  if (!ircd_strcmp(parv[parc - 1], "ZOMBIE")) {
     zombie_client(&me, &me, sptr);
     return 0;
   }

diff --git a/ircd/m_recover.c b/ircd/m_recover.c
index 8a507ce655fe8ca4ad6b7fdc34f11f4ab70654fc..51c9fae28b152a1c9ae101023b92936c10af7d07 100644 (file)
--- a/ircd/m_recover.c
+++ b/ircd/m_recover.c
@@ -80,11 +80,13 @@
 #include "config.h"
 
 #include "client.h"
+#include "hash.h"
 #include "ircd.h"
 #include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
+#include "numeric.h"
 #include "numnicks.h"
 #include "s_debug.h"
 #include "s_misc.h"
@@ -112,7 +114,7 @@ int m_recover(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     return 0;
   }
 
-  if (!(victim = findUser(parv[1]))) {
+  if (!(victim = FindUser(parv[1]))) {
     send_reply(sptr, ERR_NOSUCHNICK, parv[1]);
     return 0;
   }

diff --git a/ircd/parse.c b/ircd/parse.c
index 977e85c849d91664e94ff10c77589a957cb2a39e..1e1ebdd1536d02f4015bac395341b44e0001d1c8 100644 (file)
--- a/ircd/parse.c
+++ b/ircd/parse.c
@@ -708,7 +708,7 @@ struct Message msgtab[] = {
     TOK_SVSPART,
     0, MAXPARA, MFLG_SLOW, 0, NULL,
     /* UNREG, CLIENT, SERVER, OPER, SERVICE */
-    { m_ignore, m_ignore, ms_svspart, m_svspart, m_ignore }
+    { m_ignore, m_ignore, ms_svspart, m_ignore, m_ignore }
   },
   {
     MSG_WEBIRC,

diff --git a/ircd/s_misc.c b/ircd/s_misc.c
index 9993f58492ddf84e1167fbfe75a8d9be46e6ecaa..561c976a17cd0242dc8143fb52eebf5e0d5b05a5 100644 (file)
--- a/ircd/s_misc.c
+++ b/ircd/s_misc.c
@@ -376,7 +376,7 @@ void unzombie_client(struct Client *cptr, struct Client *sptr, struct Client *ac
     struct Flags setflags = cli_flags(acptr);
     struct Membership *chan;
     sendcmdto_one(acptr, CMD_NICK, victim, "%C", victim);
-    send_umode(victim, victim, &setflags, ALL_UMODES);
+    send_umode(victim, victim, &setflags, ALL_UMODES, 0);
 
     /*
      * mark current client as zombie on all channels so that it does not show