Merge pull request #334 from edk0/massnotice

[solanum.git] / include / numeric.h

diff --git a/include/numeric.h b/include/numeric.h
index 99d402f9b354b1e04b87f3190ccf64e35aa76e93..154ba98e0242aeb172b004759d2a8e39425d5bc3 100644 (file)
--- a/include/numeric.h
+++ b/include/numeric.h
@@ -20,31 +20,24 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: numeric.h 1793 2006-08-04 19:56:03Z jilles $
  */
 
 #ifndef INCLUDED_numeric_h
 #define INCLUDED_numeric_h
 
-#include "config.h"
-
-/*
- * form_str - return a format string for a message number
- * messages are defined below
- */
-extern const char *form_str(int);
+#include "defaults.h"
+#include "messages.h"
 
 /*
  * Reserve numerics 000-099 for server-client connections where the client
  * is local to the server. If any server is passed a numeric in this range
  * from another server then it is remapped to 100-199. -avalon
  */
-#define RPL_WELCOME          001
-#define RPL_YOURHOST         002
-#define RPL_CREATED          003
-#define RPL_MYINFO           004
-#define RPL_ISUPPORT         005
+#define RPL_WELCOME          1
+#define RPL_YOURHOST         2
+#define RPL_CREATED          3
+#define RPL_MYINFO           4
+#define RPL_ISUPPORT         5
 
 #define RPL_SNOMASK         8
 
@@ -78,7 +71,7 @@ extern const char *form_str(int);
 #define RPL_STATSYLINE       218
 #define RPL_ENDOFSTATS       219
 /* note ircu uses 217 for STATSPLINE frip. conflict
- * as RPL_STATSQLINE was used in old 2.8 for Q line 
+ * as RPL_STATSQLINE was used in old 2.8 for Q line
  * I'm going to steal 220 for now *sigh*
  * -Dianora
  */
@@ -137,6 +130,7 @@ extern const char *form_str(int);
 
 /*      RPL_WHOISADMIN       308 -- hybrid */
 
+#define RPL_WHOISHELPOP      310
 #define RPL_WHOISUSER        311
 #define RPL_WHOISSERVER      312
 #define RPL_WHOISOPERATOR    313
@@ -150,6 +144,7 @@ extern const char *form_str(int);
 
 #define RPL_ENDOFWHOIS       318
 #define RPL_WHOISCHANNELS    319
+#define RPL_WHOISSPECIAL     320
 
 #define RPL_LISTSTART        321
 #define RPL_LIST             322
@@ -298,6 +293,8 @@ extern const char *form_str(int);
 
 #define ERR_NOOPERHOST       491
 
+#define ERR_CANNOTSENDTOUSER 492
+
 #define ERR_OWNMODE          494 /* from bahamut -- jilles */
 
 #define ERR_UMODEUNKNOWNFLAG 501
@@ -307,7 +304,7 @@ extern const char *form_str(int);
 
 #define ERR_USERNOTONSERV    504
 
-/* #define ERR_LAST_ERR_MSG 505 
+/* #define ERR_LAST_ERR_MSG 505
  * moved to 999
  */
 #define ERR_WRONGPONG       513
@@ -316,8 +313,11 @@ extern const char *form_str(int);
 
 #define ERR_HELPNOTFOUND     524
 
+#define RPL_STARTTLS         670 /* ircv3.atheme.org tls-3.1 */
 #define RPL_WHOISSECURE      671 /* Unreal3.2 --nenolod */
 
+#define ERR_STARTTLS         691 /* ircv3.atheme.org tls-3.2 */
+
 #define RPL_MODLIST          702
 #define RPL_ENDOFMODLIST     703
 
@@ -368,6 +368,8 @@ extern const char *form_str(int);
 #define ERR_MLOCKRESTRICTED    742
 #define ERR_INVALIDBAN         743
 
+#define ERR_TOPICLOCK          744 /* inspircd */
+
 #define RPL_SCANMATCHED                750
 #define RPL_SCANUMODES         751