Fix macro names.

diff --git a/nick/nick.h b/nick/nick.h
index 0e5cdc3313447cc2491580b61a1e3be337df27b3..2efadf30dfb12ae7b28bfaadf7cd5e0abc734fb3 100644 (file)
--- a/nick/nick.h
+++ b/nick/nick.h
@@ -48,77 +48,77 @@
 
 #define AFLAG_ALL       0x001F
 
-#define IsInvisible(x)      ((x)->umodes & UMODE_INV)
-#define IsWallops(x)        ((x)->umodes & UMODE_WALLOPS)
-#define IsDebug(x)          ((x)->umodes & UMODE_DEBUG)
-#define IsOper(x)           ((x)->umodes & UMODE_OPER)
-#define IsService(x)        ((x)->umodes & UMODE_SERVICE)
-#define IsXOper(x)          ((x)->umodes & UMODE_XOPER)
-#define IsDeaf(x)           ((x)->umodes & UMODE_DEAF)
-#define IsAccount(x)        ((x)->umodes & UMODE_ACCOUNT)
-#define IsHideChan(x)       ((x)->umodes & UMODE_HIDECHAN)
-#define IsHideHost(x)       ((x)->umodes & UMODE_HIDEHOST)
-#define IsSetHost(x)        ((x)->umodes & UMODE_SETHOST)
-#define IsRegPriv(x)        ((x)->umodes & UMODE_REGPRIV)
-#define IsHideIdle(x)       ((x)->umodes & UMODE_HIDEIDLE)
-#define IsParanoid(x)       ((x)->umodes & UMODE_PARANOID)
-#define IsComChans(x)       ((x)->umodes & UMODE_COMCHANS)
-#define IsComChansRestr(x)  ((x)->umodes & UMODE_COMCHANSRESTR)
-#define IsCloaked(x)        ((x)->umodes & UMODE_CLOAKED)
-
-#define SetInvisible(x)      ((x)->umodes |= UMODE_INV)
-#define SetWallops(x)        ((x)->umodes |= UMODE_WALLOPS)
-#define SetDebug(x)          ((x)->umodes |= UMODE_DEBUG)
-#define SetOper(x)           ((x)->umodes |= UMODE_OPER)
-#define SetService(x)        ((x)->umodes |= UMODE_SERVICE)
-#define SetXOper(x)          ((x)->umodes |= UMODE_XOPER)
-#define SetDeaf(x)           ((x)->umodes |= UMODE_DEAF)
-#define SetAccount(x)        ((x)->umodes |= UMODE_ACCOUNT)
-#define SetHideChan(x)       ((x)->umodes |= UMODE_HIDECHAN)
-#define SetHideHost(x)       ((x)->umodes |= UMODE_HIDEHOST)
-#define SetSetHost(x)        ((x)->umodes |= UMODE_SETHOST)
-#define SetRegPriv(x)        ((x)->umodes |= UMODE_REGPRIV)
-#define SetHideIdle(x)       ((x)->umodes |= UMODE_HIDEIDLE)
-#define SetParanoid(x)       ((x)->umodes |= UMODE_PARANOID)
-#define SetComChans(x)       ((x)->umodes |= UMODE_COMCHANS)
-#define SetComChansRestr(x)  ((x)->umodes |= UMODE_COMCHANSRESTR)
-#define SetCloaked(x)        ((x)->umodes |= UMODE_CLOAKED)
-
-#define ClearInvisible(x)    ((x)->umodes &= ~UMODE_INV)
-#define ClearWallops(x)      ((x)->umodes &= ~UMODE_WALLOPS)
-#define ClearDebug(x)        ((x)->umodes &= ~UMODE_DEBUG)
-#define ClearOper(x)         ((x)->umodes &= ~UMODE_OPER)
-#define ClearService(x)      ((x)->umodes &= ~UMODE_SERVICE)
-#define ClearXOper(x)        ((x)->umodes &= ~UMODE_XOPER)
-#define ClearDeaf(x)         ((x)->umodes &= ~UMODE_DEAF)
-#define ClearAccount(x)      ((x)->umodes &= ~UMODE_ACCOUNT)
-#define ClearHideChan(x)     ((x)->umodes &= ~UMODE_HIDECHAN)
-#define ClearHideHost(x)     ((x)->umodes &= ~UMODE_HIDEHOST)
-#define ClearSetHost(x)      ((x)->umodes &= ~UMODE_SETHOST)
-#define ClearRegPriv(x)      ((x)->umodes &= ~UMODE_REGPRIV)
-#define ClearHideIdle(x)     ((x)->umodes &= ~UMODE_HIDEIDLE)
-#define ClearParanoid(x)     ((x)->umodes &= ~UMODE_PARANOID)
-#define SetComChans(x)       ((x)->umodes &= ~UMODE_COMCHANS)
-#define SetComChansRestr(x)  ((x)->umodes &= ~UMODE_COMCHANSRESTR)
-#define ClearCloaked(x)      ((x)->umodes &= ~UMODE_CLOAKED)
-
-#define IsStaff(x)           ((x)->flags & AFLAG_STAFF)
-#define IsDeveloper(x)       ((x)->flags & AFLAG_DEVELOPER)
-#define IsSupport(x)         ((x)->flags & AFLAG_SUPPORT)
-#define IsAdmin(x)           ((x)->flags & AFLAG_ADMIN)
-#define IsOperFlag(x)        ((x)->flags & AFLAG_OPER)
-
-#define SetStaff(x)          ((x)->flags |= AFLAG_STAFF)
-#define SetDeveloper(x)      ((x)->flags |= AFLAG_DEVELOPER)
-#define SetSupport(x)        ((x)->flags |= AFLAG_SUPPORT)
-#define SetAdmin(x)          ((x)->flags |= AFLAG_ADMIN)
-#define SetOperFlag(x)       ((x)->flags |= AFLAG_OPER)
-
-#define ClearStaff(x)        ((x)->flags &= ~AFLAG_STAFF)
-#define ClearDeveloper(x)    ((x)->flags &= ~AFLAG_DEVELOPER)
-#define ClearSupport(x)      ((x)->flags &= ~AFLAG_SUPPORT)
-#define ClearAdmin(x)        ((x)->flags &= ~AFLAG_ADMIN)
-#define ClearOperFlag(x)     ((x)->flags &= ~AFLAG_OPER)
+#define IsInvisible(x)        ((x)->umodes & UMODE_INV)
+#define IsWallops(x)          ((x)->umodes & UMODE_WALLOPS)
+#define IsDebug(x)            ((x)->umodes & UMODE_DEBUG)
+#define IsOper(x)             ((x)->umodes & UMODE_OPER)
+#define IsService(x)          ((x)->umodes & UMODE_SERVICE)
+#define IsXOper(x)            ((x)->umodes & UMODE_XOPER)
+#define IsDeaf(x)             ((x)->umodes & UMODE_DEAF)
+#define IsAccount(x)          ((x)->umodes & UMODE_ACCOUNT)
+#define IsHideChan(x)         ((x)->umodes & UMODE_HIDECHAN)
+#define IsHideHost(x)         ((x)->umodes & UMODE_HIDEHOST)
+#define IsSetHost(x)          ((x)->umodes & UMODE_SETHOST)
+#define IsRegPriv(x)          ((x)->umodes & UMODE_REGPRIV)
+#define IsHideIdle(x)         ((x)->umodes & UMODE_HIDEIDLE)
+#define IsParanoid(x)         ((x)->umodes & UMODE_PARANOID)
+#define IsComChans(x)         ((x)->umodes & UMODE_COMCHANS)
+#define IsComChansRestr(x)    ((x)->umodes & UMODE_COMCHANSRESTR)
+#define IsCloaked(x)          ((x)->umodes & UMODE_CLOAKED)
+
+#define SetInvisible(x)       ((x)->umodes |= UMODE_INV)
+#define SetWallops(x)         ((x)->umodes |= UMODE_WALLOPS)
+#define SetDebug(x)           ((x)->umodes |= UMODE_DEBUG)
+#define SetOper(x)            ((x)->umodes |= UMODE_OPER)
+#define SetService(x)         ((x)->umodes |= UMODE_SERVICE)
+#define SetXOper(x)           ((x)->umodes |= UMODE_XOPER)
+#define SetDeaf(x)            ((x)->umodes |= UMODE_DEAF)
+#define SetAccount(x)         ((x)->umodes |= UMODE_ACCOUNT)
+#define SetHideChan(x)        ((x)->umodes |= UMODE_HIDECHAN)
+#define SetHideHost(x)        ((x)->umodes |= UMODE_HIDEHOST)
+#define SetSetHost(x)         ((x)->umodes |= UMODE_SETHOST)
+#define SetRegPriv(x)         ((x)->umodes |= UMODE_REGPRIV)
+#define SetHideIdle(x)        ((x)->umodes |= UMODE_HIDEIDLE)
+#define SetParanoid(x)        ((x)->umodes |= UMODE_PARANOID)
+#define SetComChans(x)        ((x)->umodes |= UMODE_COMCHANS)
+#define SetComChansRestr(x)   ((x)->umodes |= UMODE_COMCHANSRESTR)
+#define SetCloaked(x)         ((x)->umodes |= UMODE_CLOAKED)
+
+#define ClearInvisible(x)     ((x)->umodes &= ~UMODE_INV)
+#define ClearWallops(x)       ((x)->umodes &= ~UMODE_WALLOPS)
+#define ClearDebug(x)         ((x)->umodes &= ~UMODE_DEBUG)
+#define ClearOper(x)          ((x)->umodes &= ~UMODE_OPER)
+#define ClearService(x)       ((x)->umodes &= ~UMODE_SERVICE)
+#define ClearXOper(x)         ((x)->umodes &= ~UMODE_XOPER)
+#define ClearDeaf(x)          ((x)->umodes &= ~UMODE_DEAF)
+#define ClearAccount(x)       ((x)->umodes &= ~UMODE_ACCOUNT)
+#define ClearHideChan(x)      ((x)->umodes &= ~UMODE_HIDECHAN)
+#define ClearHideHost(x)      ((x)->umodes &= ~UMODE_HIDEHOST)
+#define ClearSetHost(x)       ((x)->umodes &= ~UMODE_SETHOST)
+#define ClearRegPriv(x)       ((x)->umodes &= ~UMODE_REGPRIV)
+#define ClearHideIdle(x)      ((x)->umodes &= ~UMODE_HIDEIDLE)
+#define ClearParanoid(x)      ((x)->umodes &= ~UMODE_PARANOID)
+#define ClearComChans(x)      ((x)->umodes &= ~UMODE_COMCHANS)
+#define ClearComChansRestr(x) ((x)->umodes &= ~UMODE_COMCHANSRESTR)
+#define ClearCloaked(x)       ((x)->umodes &= ~UMODE_CLOAKED)
+
+#define IsStaff(x)            ((x)->flags & AFLAG_STAFF)
+#define IsDeveloper(x)        ((x)->flags & AFLAG_DEVELOPER)
+#define IsSupport(x)          ((x)->flags & AFLAG_SUPPORT)
+#define IsAdmin(x)            ((x)->flags & AFLAG_ADMIN)
+#define IsOperFlag(x)         ((x)->flags & AFLAG_OPER)
+
+#define SetStaff(x)           ((x)->flags |= AFLAG_STAFF)
+#define SetDeveloper(x)       ((x)->flags |= AFLAG_DEVELOPER)
+#define SetSupport(x)         ((x)->flags |= AFLAG_SUPPORT)
+#define SetAdmin(x)           ((x)->flags |= AFLAG_ADMIN)
+#define SetOperFlag(x)        ((x)->flags |= AFLAG_OPER)
+
+#define ClearStaff(x)         ((x)->flags &= ~AFLAG_STAFF)
+#define ClearDeveloper(x)     ((x)->flags &= ~AFLAG_DEVELOPER)
+#define ClearSupport(x)       ((x)->flags &= ~AFLAG_SUPPORT)
+#define ClearAdmin(x)         ((x)->flags &= ~AFLAG_ADMIN)
+#define ClearOperFlag(x)      ((x)->flags &= ~AFLAG_OPER)
 
 #define NickOnServiceServer(target)   SIsService(&serverlist[homeserver((target)->numeric)])