Merging again and again

[irc/rqf/shadowircd.git] / include / client.h

diff --git a/include/client.h b/include/client.h
index c3312df83e07978bda66aea8d2be3c7e2e3fa9fc..943098e6fed6f4ff3ff6560ec2909f7c36607e71 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -35,14 +35,12 @@
 #endif
 
 #include "ircd_defs.h"
-#include "linebuf.h"
 #include "channel.h"
 #include "res.h"
 #include "snomask.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
 #include "ircd.h"
-#include "commio.h"
 
 /* other structs */
 struct Blacklist;
@@ -596,7 +594,7 @@ extern client_t *find_person(const char *);
 extern client_t *find_named_person(const char *);
 extern client_t *next_client(struct Client *, const char *);
 
-#define accept_message(s, t) ((s) == (t) || (dlinkFind((s), &((t)->localClient->allow_list))))
+#define accept_message(s, t) ((s) == (t) || (rb_dlinkFind((s), &((t)->localClient->allow_list))))
 extern void del_all_accepts(struct Client *client_p);
 
 extern void dead_link(struct Client *client_p);
@@ -611,4 +609,7 @@ extern void close_connection(struct Client *);
 extern void init_uid(void);
 extern char *generate_uid(void);
 
+void allocate_away(struct Client *);\r
+void free_away(struct Client *);
+
 #endif /* INCLUDED_client_h */