lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into next

Browse source
This commit is contained in:
Alam Ed Arias 2015-02-05 17:05:20 -05:00
parent e0f90d83ee 01d441e6c0
commit 776dafa0bb
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
*
*.*

4
src/i_tcp.c
View file

@ -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