X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconf.h;h=cd9cb9581fba4dd91daae6e7fdabd3a6a8ee2626;hp=5328465677c5939aa9718c03c5c0b24ab4846d3c;hb=0e4e22a7a671d1e8efbc44bffd80062191f75c38;hpb=4c113d8850dfc423e3dae2d2f90e7e9a9d42f0b0

diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h
index 53284656..cd9cb958 100644
--- a/src/ngircd/conf.h
+++ b/src/ngircd/conf.h
@@ -67,14 +67,13 @@ struct SSLOptions {
 #endif
 
 
-typedef struct _Conf_Channel
-{
+struct Conf_Channel {
 	char name[CHANNEL_NAME_LEN];	/* Name of the channel */
 	char modes[CHANNEL_MODE_LEN];	/* Initial channel modes */
 	char key[CLIENT_PASS_LEN];      /* Channel key ("password", mode "k" ) */
+	char topic[COMMAND_LEN];	/* Initial topic */
 	unsigned long maxusers;		/* maximum usercount for this channel, mode "l" */
-	array topic;			/* Initial topic */
-} CONF_CHANNEL;
+};
 
 
 #define CONF_SFLAG_ONCE	1		/* Delete this entry after next disconnect */
@@ -132,8 +131,8 @@ GLOBAL unsigned int Conf_Oper_Count;
 GLOBAL CONF_SERVER Conf_Server[MAX_SERVERS];
 
 /* Pre-defined channels */
-GLOBAL CONF_CHANNEL Conf_Channel[MAX_DEFCHANNELS];
-GLOBAL unsigned int Conf_Channel_Count;
+GLOBAL array Conf_Channels;
+
 /* Pre-defined channels only */
 GLOBAL bool Conf_PredefChannelsOnly;