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);