X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/cbeab4bc340b7b3f4fbf424ff327758defb9598a..52fae04da0a3934413654040f5e5e60b38b3f676:/include/hostmask.h

diff --git a/include/hostmask.h b/include/hostmask.h
index 43dadc0a..bb41b6c2 100644
--- a/include/hostmask.h
+++ b/include/hostmask.h
@@ -28,10 +28,8 @@
 enum
 {
 	HM_HOST,
-	HM_IPV4
-#ifdef RB_IPV6
-		, HM_IPV6
-#endif
+	HM_IPV4,
+	HM_IPV6,
 };
 
 int parse_netmask(const char *, struct rb_sockaddr_storage *, int *);
@@ -54,12 +52,10 @@ struct ConfItem *find_dline(struct sockaddr *, int);
 #define find_kline(x)	(find_conf_by_address((x)->host, (x)->sockhost, \
 			 (x)->orighost, \
 			 (struct sockaddr *)&(x)->localClient->ip, CONF_KILL,\
-			 (x)->localClient->ip.ss_family, (x)->username, NULL))
+			 GET_SS_FAMILY(&(x)->localClient->ip), (x)->username, NULL))
 
 void report_auth(struct Client *);
-#ifdef RB_IPV6
 int match_ipv6(struct sockaddr *, struct sockaddr *, int);
-#endif
 int match_ipv4(struct sockaddr *, struct sockaddr *, int);
 
 /* Hashtable stuff... */