From 448a78d1710a8be653a520110edbd4bc4742c5d5 Mon Sep 17 00:00:00 2001
From: pk910 <philipp@zoelle1.de>
Date: Fri, 11 May 2012 04:47:00 +0200
Subject: [PATCH] fixed some collisions with older commits

---
 include/s_user.h | 2 --
 ircd/m_quit.c    | 2 +-
 ircd/m_recover.c | 4 +++-
 ircd/parse.c     | 2 +-
 ircd/s_misc.c    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/s_user.h b/include/s_user.h
index 7803503..970e45b 100644
--- 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 20b8224..9c06b31 100644
--- 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 8a507ce..51c9fae 100644
--- 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 977e85c..1e1ebdd 100644
--- 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 9993f58..561c976 100644
--- 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
-- 
2.20.1