X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/38ffccf8c33a4e991148e268ba739996197f2c2b..01fb744c405792dd3f0859a53f74cd4cb5fd166f:/include/s_serv.h

diff --git a/include/s_serv.h b/include/s_serv.h
index 4f697dba..3a99b6e8 100644
--- a/include/s_serv.h
+++ b/include/s_serv.h
@@ -20,14 +20,12 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: s_serv.h 1863 2006-08-27 13:40:37Z jilles $
  */
 
 #ifndef INCLUDED_serv_h
 #define INCLUDED_serv_h
 
-#include "config.h"
+#include "defaults.h"
 #include "capability.h"
 
 /*
@@ -53,11 +51,11 @@ extern struct CapabilityIndex *cli_capindex;
 
 /* register client capabilities with this structure for 3.2 enhanced capability negotiation */
 #define CLICAP_FLAGS_STICKY    0x001
-#define CLICAP_FLAGS_REQACK    0x002
+#define CLICAP_FLAGS_PRIORITY  0x002
 
 struct ClientCapability {
-	int (*visible)(struct Client *);			/* whether or not to display the capability.  set to NULL or true return value = displayed */
-	const char *(*data)(struct Client *);			/* any custom data for the capability.  set to NULL or return NULL = no data */
+	bool (*visible)(struct Client *);		/* whether or not to display the capability.  set to NULL or true return value = displayed */
+	const char *(*data)(struct Client *);		/* any custom data for the capability.  set to NULL or return NULL = no data */
 	unsigned int flags;
 };
 
@@ -81,7 +79,6 @@ extern unsigned int CAP_EX;			/* Can do channel +e exemptions */
 extern unsigned int CAP_CHW;			/* Can do channel wall @# */
 extern unsigned int CAP_IE;			/* Can do invite exceptions */
 extern unsigned int CAP_KLN;			/* Can do KLINE message */
-extern unsigned int CAP_ZIP;			/* Can do ZIPlinks */
 extern unsigned int CAP_KNOCK;			/* supports KNOCK */
 extern unsigned int CAP_TB;			/* supports TBURST */
 extern unsigned int CAP_UNKLN;			/* supports remote unkline */
@@ -95,16 +92,11 @@ extern unsigned int CAP_EUID;			/* supports EUID (ext UID + nonencap CHGHOST) */
 extern unsigned int CAP_EOPMOD;			/* supports EOPMOD (ext +z + ext topic) */
 extern unsigned int CAP_BAN;			/* supports propagated bans */
 extern unsigned int CAP_MLOCK;			/* supports MLOCK messages */
+extern unsigned int CAP_EBMASK;			/* supports sending BMASK set by/at metadata */
 
 /* XXX: added for backwards compatibility. --nenolod */
 #define CAP_MASK	(capability_index_mask(serv_capindex) & ~(CAP_TS6 | CAP_CAP))
 
-#ifdef HAVE_LIBZ
-#define CAP_ZIP_SUPPORTED       CAP_ZIP
-#else
-#define CAP_ZIP_SUPPORTED       0
-#endif
-
 /*
  * Capability macros.
  */