Merge branch 'edk0-check-one-kline'

[solanum.git] / include / s_serv.h

diff --git a/include/s_serv.h b/include/s_serv.h
index 98bf56f9c7371fad2e04c6ba4f9cf0bc44df92a3..6808c37e9aa786befbd9cf94f869258986a5e3ae 100644 (file)
--- 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"
 
 /*
@@ -56,22 +54,20 @@ extern struct CapabilityIndex *cli_capindex;
 #define CLICAP_FLAGS_REQACK    0x002
 
 struct ClientCapability {
-       int (*visible)(void);                   /* whether or not to display the capability.  set to NULL or true return value = displayed */
-       const char *(*data)(void);              /* 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;
 };
 
 /* builtin client capabilities */
 extern unsigned int CLICAP_MULTI_PREFIX;
-extern unsigned int CLICAP_SASL;
 extern unsigned int CLICAP_ACCOUNT_NOTIFY;
 extern unsigned int CLICAP_EXTENDED_JOIN;
 extern unsigned int CLICAP_AWAY_NOTIFY;
-extern unsigned int CLICAP_TLS;
 extern unsigned int CLICAP_USERHOST_IN_NAMES;
 extern unsigned int CLICAP_CAP_NOTIFY;
 extern unsigned int CLICAP_CHGHOST;
-extern unsigned int CLICAP_ACCOUNT_TAG;
+extern unsigned int CLICAP_ECHO_MESSAGE;
 
 /*
  * XXX: this is kind of ugly, but this allows us to have backwards