Author: Kev <klmitch@mit.edu>

[ircu2.10.12-pk.git] / include / numnicks.h

diff --git a/include/numnicks.h b/include/numnicks.h
index e3bc250deb69e3c69bebd57e0b9cfff386750a9e..cb812c399a86616006c5699e9b834e32616fbd86 100644 (file)
--- a/include/numnicks.h
+++ b/include/numnicks.h
@@ -20,6 +20,9 @@
  */
 #ifndef INCLUDED_numnicks_h
 #define INCLUDED_numnicks_h
+#ifndef INCLUDED_client_h
+#include "client.h"
+#endif
 #ifndef INCLUDED_sys_types_h
 #include <sys/types.h>
 #define INCLUDED_sys_types_h
@@ -41,17 +44,17 @@
 /*
  * Use this macro as follows: sprintf(buf, "%s%s ...", NumNick(cptr), ...);
  */
-#define NumNick(c) (c)->user->server->yxx, (c)->yxx
+#define NumNick(c) cli_yxx((cli_user(c))->server), cli_yxx(c)
 
 /*
  * Use this macro as follows: sprintf(buf, "%s ...", NumServ(cptr), ...);
  */
-#define NumServ(c) (c)->yxx
+#define NumServ(c) cli_yxx(c)
 
 /*
  * Use this macro as follows: sprintf(buf, "%s%s ...", NumServCap(cptr), ...);
  */
-#define NumServCap(c) (c)->yxx, (c)->serv->nn_capacity
+#define NumServCap(c) cli_yxx(c), (cli_serv(c))->nn_capacity
 
 /*
  * Structures
@@ -61,8 +64,8 @@ struct Client;
 /*
  * Proto types
  */
-extern int  SetRemoteNumNick(struct Client* cptr, const char* yxx);
-extern void SetLocalNumNick(struct Client* cptr);
+extern void SetRemoteNumNick(struct Client* cptr, const char* yxx);
+extern int  SetLocalNumNick(struct Client* cptr);
 extern void RemoveYXXClient(struct Client* server, const char* yxx);
 extern void SetServerYXX(struct Client* cptr, 
                          struct Client* server, const char* yxx);