X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/68876ea24b3d1782d404a39989ad855b328e5304..8ad278b08812c06f7c7f97a7346f99319ba134a3:/src/match.c

diff --git a/src/match.c b/src/match.c
index 7a9ad94..5d9e8fe 100644
--- a/src/match.c
+++ b/src/match.c
@@ -307,7 +307,7 @@ int comp_with_mask_sock(struct sockaddr *addr, struct sockaddr *dest, u_int mask
 		iaddr = &((struct sockaddr_in *)addr)->sin_addr;
 		idest = &((struct sockaddr_in *)dest)->sin_addr;
 	}
-#ifdef IPV6
+#ifdef RB_IPV6
 	else
 	{
 		iaddr = &((struct sockaddr_in6 *)addr)->sin6_addr;
@@ -326,7 +326,7 @@ int comp_with_mask_sock(struct sockaddr *addr, struct sockaddr *dest, u_int mask
  */
 int match_ips(const char *s1, const char *s2)
 {
-	struct irc_sockaddr_storage ipaddr, maskaddr;
+	struct rb_sockaddr_storage ipaddr, maskaddr;
 	char mask[BUFSIZE];
 	char address[HOSTLEN + 1];
 	char *len;
@@ -346,7 +346,7 @@ int match_ips(const char *s1, const char *s2)
 	if (cidrlen == 0)
 		return 0;
 
-#ifdef IPV6
+#ifdef RB_IPV6
 	if (strchr(mask, ':') && strchr(address, ':'))
 	{
 		aftype = AF_INET6;
@@ -380,7 +380,7 @@ int match_ips(const char *s1, const char *s2)
 
 int match_cidr(const char *s1, const char *s2)
 {
-	struct irc_sockaddr_storage ipaddr, maskaddr;
+	struct rb_sockaddr_storage ipaddr, maskaddr;
 	char mask[BUFSIZE];
 	char address[NICKLEN + USERLEN + HOSTLEN + 6];
 	char *ipmask;
@@ -414,7 +414,7 @@ int match_cidr(const char *s1, const char *s2)
 	if (cidrlen == 0)
 		return 0;
 
-#ifdef IPV6
+#ifdef RB_IPV6
 	if (strchr(ip, ':') && strchr(ipmask, ':'))
 	{
 		aftype = AF_INET6;