sync all done, dont worry the language files for en_UK (now en_GB) are still there...

[irc/evilnet/x3.git] / src / proto.h

diff --git a/src/proto.h b/src/proto.h
index ebe747e196d3be94959684b1c384539edd1fff80..72e6f4e5255bcd1deb4e5258f1edd73a6326fb72 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -1,7 +1,7 @@
 /* proto.h - IRC protocol output
  * Copyright 2000-2004 srvx Development Team
  *
- * This file is part of srvx.
+ * This file is part of x3.
  *
  * srvx is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 
 /* Warning for those looking at how this code does multi-protocol
  * support: It's an awful, nasty hack job.  It is intended for short
- * term use, not long term, since we are already developing srvx2,
+ * term use, not long term, since we are already developing x3,
  * which has much nicer interfaces that hide most of the ugly
  * differences between protocol dialects. */
 
@@ -108,8 +108,6 @@ void unreg_notice_func(struct userNode *user, privmsg_func_t handler);
 typedef void (*oper_func_t) (struct userNode *user);
 void reg_oper_func(oper_func_t handler);
 
-extern struct userList dead_users;
-
 /* replay silliness */
 void replay_read_line(void);
 void replay_event_loop(void);
@@ -134,6 +132,7 @@ void irc_wallchops(struct userNode *from, const char *to, const char *message);
 void irc_join(struct userNode *who, struct chanNode *what);
 void irc_invite(struct userNode *from, struct userNode *who, struct chanNode *to);
 void irc_mode(struct userNode *who, struct chanNode *target, const char *modes);
+void irc_umode(struct userNode *target, const char *modes);
 void irc_kick(struct userNode *who, struct userNode *target, struct chanNode *from, const char *msg);
 void irc_part(struct userNode *who, struct chanNode *what, const char *reason);
 void irc_topic(struct userNode *who, struct chanNode *what, const char *topic);
@@ -234,7 +233,7 @@ int irc_make_chanmode(struct chanNode *chan, char *out);
 #define GENMASK_USENICK  2
 #define GENMASK_OMITNICK 4  /* Hurray for Kevin! */
 #define GENMASK_BYIP     8
-#define GENMASK_SRVXMASK 16
+#define GENMASK_X3MASK 16
 #define GENMASK_NO_HIDING 128
 char *generate_hostmask(struct userNode *user, int options);