From: Michael Poole <mdpoole@troilus.org>
Date: Sun, 3 Jan 2010 19:42:24 +0000 (+0000)
Subject: Fix the build for the new xquery files.
X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=commitdiff_plain;h=96ac6f5f009f8b3bc8085b6da49783abb3240983

Fix the build for the new xquery files.


git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/branches/u2_10_12_branch@1926 c9e4aea6-c8fd-4c43-8297-357d70d61c8c
---

diff --git a/ChangeLog b/ChangeLog
index 613e88e..4fa0b8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-03  Michael Poole <mdpoole@troilus.org>
+
+	* ircd/Makefile.in (IRCD_SRC): Add m_xquery.c and m_xreply.c to
+	the build.
+
+	* ircd/m_xquery.c: Add missing include.
+	(mo_xquery): Fix spelling of struct Client.
+	(ms_xquery): Likewise.
+
+	* ircd/m_xreply.c: Add missing includes.
+	(ms_xreply): Fix spelling of struct Client and findNUser().
+
 2010-01-01  Kevin L. Mitchell  <klmitch@mit.edu>
 
 	* doc/readme.xquery: documentation for design and use of the
diff --git a/ircd/Makefile.in b/ircd/Makefile.in
index 3b01d2d..f7dd610 100644
--- a/ircd/Makefile.in
+++ b/ircd/Makefile.in
@@ -186,6 +186,8 @@ IRCD_SRC = \
 	m_who.c \
 	m_whois.c \
 	m_whowas.c \
+	m_xreply.c \
+	m_xquery.c \
 	match.c \
 	memdebug.c \
 	motd.c \
diff --git a/ircd/m_xquery.c b/ircd/m_xquery.c
index 49d7e7e..c1cc4ec 100644
--- a/ircd/m_xquery.c
+++ b/ircd/m_xquery.c
@@ -83,6 +83,7 @@
 #include "client.h"
 #include "ircd.h"
 #include "ircd_log.h"
+#include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
 #include "numeric.h"
@@ -101,7 +102,7 @@
  */
 int mo_xquery(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 {
-  struct client* acptr;
+  struct Client* acptr;
 
   if (parc < 4) /* have enough parameters? */
     return need_more_params(sptr, "XQUERY");
@@ -128,7 +129,7 @@ int mo_xquery(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
  */
 int ms_xquery(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 {
-  struct client* acptr;
+  struct Client* acptr;
 
   if (parc < 4) /* have enough parameters? */
     return need_more_params(sptr, "XQUERY");
diff --git a/ircd/m_xreply.c b/ircd/m_xreply.c
index d43c9fe..2c81956 100644
--- a/ircd/m_xreply.c
+++ b/ircd/m_xreply.c
@@ -83,9 +83,11 @@
 #include "client.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_auth.h"
 #include "send.h"
 
@@ -101,7 +103,7 @@
  */
 int ms_xreply(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 {
-  struct client* acptr;
+  struct Client* acptr;
   const char* routing;
   const char* reply;
 
@@ -112,7 +114,7 @@ int ms_xreply(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   reply = parv[3];
 
   /* Look up the target */
-  if (!(acptr = FindNServer(parv[1])) && !(acptr = FindNUser(parv[1])))
+  if (!(acptr = FindNServer(parv[1])) && !(acptr = findNUser(parv[1])))
     return send_reply(sptr, SND_EXPLICIT | ERR_NOSUCHSERVER,
 		      "* :Server has disconnected");