mirror of
https://github.com/SerenityOS/serenity
synced 2024-10-15 20:33:10 +00:00
50 lines
1.1 KiB
Diff
50 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jesse Buhagiar <jooster669@gmail.com>
|
|
Date: Fri, 25 Mar 2022 09:45:32 +1100
|
|
Subject: [PATCH] Engine: Move `#ifdef` to more sensible location
|
|
|
|
No linker errors in this dojo!
|
|
---
|
|
code/qcommon/net_ip.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/code/qcommon/net_ip.c b/code/qcommon/net_ip.c
|
|
index ea940f5..aaba832 100644
|
|
--- a/code/qcommon/net_ip.c
|
|
+++ b/code/qcommon/net_ip.c
|
|
@@ -1000,9 +1000,9 @@ NET_JoinMulticast
|
|
Join an ipv6 multicast group
|
|
====================
|
|
*/
|
|
-#ifndef __serenity__
|
|
void NET_JoinMulticast6(void)
|
|
{
|
|
+#ifndef __serenity__
|
|
int err;
|
|
|
|
if(ip6_socket == INVALID_SOCKET || multicast6_socket != INVALID_SOCKET || (net_enabled->integer & NET_DISABLEMCAST))
|
|
@@ -1049,10 +1049,12 @@ void NET_JoinMulticast6(void)
|
|
return;
|
|
}
|
|
}
|
|
+#endif
|
|
}
|
|
|
|
void NET_LeaveMulticast6()
|
|
{
|
|
+#ifndef __serenity__
|
|
if(multicast6_socket != INVALID_SOCKET)
|
|
{
|
|
if(multicast6_socket != ip6_socket)
|
|
@@ -1062,9 +1064,8 @@ void NET_LeaveMulticast6()
|
|
|
|
multicast6_socket = INVALID_SOCKET;
|
|
}
|
|
-}
|
|
-
|
|
#endif
|
|
+}
|
|
|
|
/*
|
|
====================
|