Merge pull request #282 from edk0/propagate-oper

[solanum.git] / include / match.h

diff --git a/include/match.h b/include/match.h
index 85e8f1cce571f8bfd2a93cd70ae4d8c95bc01f55..ef7ed8e2cad9a1e6fa35430760d1d02547e6cee3 100644 (file)
--- a/include/match.h
+++ b/include/match.h
@@ -46,8 +46,8 @@ extern int match_ips(const char *mask, const char *name);
 /*
  * comp_with_mask - compares to IP address
  */
-int comp_with_mask(void *addr, void *dest, u_int mask);
-int comp_with_mask_sock(struct sockaddr *addr, struct sockaddr *dest, u_int mask);
+int comp_with_mask(void *addr, void *dest, unsigned int mask);
+int comp_with_mask_sock(struct sockaddr *addr, struct sockaddr *dest, unsigned int mask);
 
 /*
  * collapse - collapse a string in place, converts multiple adjacent *'s
@@ -81,13 +81,13 @@ extern char *canonize(char *);
 /*
  * character macros
  */
-extern const unsigned char ToLowerTab[];
-#define ToLower(c) (ToLowerTab[(unsigned char)(c)])
+extern const unsigned char irctolower_tab[];
+#define irctolower(c) (irctolower_tab[(unsigned char)(c)])
 
-extern const unsigned char ToUpperTab[];
-#define ToUpper(c) (ToUpperTab[(unsigned char)(c)])
+extern const unsigned char irctoupper_tab[];
+#define irctoupper(c) (irctoupper_tab[(unsigned char)(c)])
 
-extern const unsigned int CharAttrs[];
+extern unsigned int CharAttrs[];
 
 #define PRINT_C   0x001
 #define CNTRL_C   0x002
@@ -143,7 +143,7 @@ static inline void irccasecanon(char *str)
 {
         while (*str)
         {
-                *str = ToUpper(*str);
+                *str = irctoupper(*str);
                 str++;
         }
         return;