Merge branch 'development'

[NeonServV5.git] / src / WHOHandler.h

diff --git a/src/WHOHandler.h b/src/WHOHandler.h
index ee27779ceff56eac7d31ee5b5957854d76acc0a9..03e30d1227f08a1fa5b7e3cd53e0dc3bf0f864c5 100644 (file)
--- a/src/WHOHandler.h
+++ b/src/WHOHandler.h
@@ -1,5 +1,5 @@
-/* WHOHandler.h - NeonServ v5.2
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* WHOHandler.h - NeonServ v5.6
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,13 +29,16 @@ typedef USERLIST_CALLBACK(userlist_callback_t);
 #define USERAUTH_CALLBACK(NAME) void NAME(UNUSED_ARG(struct ClientSocket *client), UNUSED_ARG(char *user_nick), UNUSED_ARG(struct UserNode *user), UNUSED_ARG(void *data))
 typedef USERAUTH_CALLBACK(userauth_callback_t);
 
+#define get_userlist_if_invisible(CHAN, MODID, CALLBACK, DATA) _get_userlist_with_invisible(CHAN, MODID, CALLBACK, DATA, 0)
+#define get_userlist_with_invisible(CHAN, MODID, CALLBACK, DATA) _get_userlist_with_invisible(CHAN, MODID, CALLBACK, DATA, 1)
+
+#ifndef DND_FUNCTIONS
+void clear_whoqueue(struct ClientSocket *client);
 void recv_whohandler_354(struct ClientSocket *client, char **argv, unsigned int argc);
 void recv_whohandler_315(struct ClientSocket *client, char **argv, unsigned int argc);
-void get_userlist(struct ChanNode *chan, userlist_callback_t callback, void *data);
-#define get_userlist_if_invisible(CHAN, CALLBACK, DATA) _get_userlist_with_invisible(CHAN, CALLBACK, DATA, 0)
-#define get_userlist_with_invisible(CHAN, CALLBACK, DATA) _get_userlist_with_invisible(CHAN, CALLBACK, DATA, 1)
-void _get_userlist_with_invisible(struct ChanNode *chan, userlist_callback_t callback, void *data, int force);
-void get_userauth(struct UserNode *user, userauth_callback_t callback, void *data);
+/* MODULAR ACCESSIBLE */ void get_userlist(struct ChanNode *chan, int module_id, userlist_callback_t callback, void *data);
+/* MODULAR ACCESSIBLE */ void _get_userlist_with_invisible(struct ChanNode *chan, int module_id, userlist_callback_t callback, void *data, int force);
+/* MODULAR ACCESSIBLE */ void get_userauth(struct UserNode *user, int module_id, userauth_callback_t callback, void *data);
 void free_whoqueue();
-
-#endif
\ No newline at end of file
+#endif
+#endif