Automated sync with http://hg.angelforce.ru/charybdis

[irc/rqf/shadowircd.git] / include / s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index 584fab5f962952cef5d781a61581b4d0f3a99197..79a8766fb8cdd80ee51a4d7fe3ee95f7a7ca7f72 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -46,7 +46,7 @@ struct hostent;
 
 struct ip_value
 {
-       struct irc_sockaddr_storage ip;
+       struct rb_sockaddr_storage ip;
        int ip_mask;
        int type;
 };
@@ -271,15 +271,15 @@ struct server_info
        char *network_desc;
        int hub;
        struct sockaddr_in ip;
-#ifdef IPV6
+#ifdef RB_IPV6
        struct sockaddr_in6 ip6;
 #endif
        int specific_ipv4_vhost;
-#ifdef IPV6
+#ifdef RB_IPV6
        int specific_ipv6_vhost;
 #endif
 
-       int max_clients;
+       int default_max_clients;
 };
 
 struct admin_info