Branch merge

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

diff --git a/include/channel.h b/include/channel.h
index 5850db2fe72e332284fad0756fe7279542a433f7..4ce46aa723200a1dd1b61e8f327f385d1a9e3d25 100644 (file)
--- a/include/channel.h
+++ b/include/channel.h
@@ -268,9 +268,7 @@ extern void channel_member_names(struct Channel *chptr, struct Client *,
 
 extern void del_invite(struct Channel *chptr, struct Client *who);
 
-const char *channel_modes_real(struct Channel *chptr, struct Mode *mode, struct Client *who);
-#define channel_modes(chptr, who)   channel_modes_real(chptr, &(chptr)->mode, who)
-#define channel_mlock(chptr, who)   channel_modes_real(chptr, &(chptr)->mode_lock, who)
+const char *channel_modes(struct Channel *chptr, struct Client *who);
 
 extern int has_common_channel(struct Client *client1, struct Client *client2);