Merge branch 'master' into next
This commit is contained in:
commit
776dafa0bb
|
@ -0,0 +1,2 @@
|
||||||
|
*
|
||||||
|
*.*
|
|
@ -651,7 +651,7 @@ static void SOCK_Send(void)
|
||||||
if (broadcastaddress[i].any.sa_family == AF_INET)
|
if (broadcastaddress[i].any.sa_family == AF_INET)
|
||||||
d = d4;
|
d = d4;
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
if (broadcastaddress[i].any.sa_family == AF_INET6)
|
else if (broadcastaddress[i].any.sa_family == AF_INET6)
|
||||||
d = d6;
|
d = d6;
|
||||||
#endif
|
#endif
|
||||||
else
|
else
|
||||||
|
@ -690,7 +690,7 @@ static void SOCK_Send(void)
|
||||||
if (clientaddress[doomcom->remotenode].any.sa_family == AF_INET)
|
if (clientaddress[doomcom->remotenode].any.sa_family == AF_INET)
|
||||||
d = d4;
|
d = d4;
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
if (clientaddress[doomcom->remotenode].any.sa_family == AF_INET6)
|
else if (clientaddress[doomcom->remotenode].any.sa_family == AF_INET6)
|
||||||
d = d6;
|
d = d6;
|
||||||
#endif
|
#endif
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue