qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-17 22:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

hopefully fix compiling in Irix

Browse source
This commit is contained in:
Bill Currie 2002-09-18 15:31:44 +00:00
parent 576fc27749
commit 606cb9abb0
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nq/include/net.h
View file

@ -35,8 +35,8 @@
struct qsockaddr
{
short sa_family;
unsigned char sa_data[14];
short qsa_family;
unsigned char qsa_data[14];
};

2
nq/source/net_dgrm.c
View file

@ -1030,7 +1030,7 @@ _Datagram_CheckNewConnections (void)
}
#ifdef BAN_TEST
// check for a ban
if (clientaddr.sa_family == AF_INET) {
if (clientaddr.qsa_family == AF_INET) {
unsigned long testAddr;
testAddr = ((struct sockaddr_in *) &clientaddr)->sin_addr.s_addr;

8
nq/source/net_udp.c
View file

@ -281,7 +281,7 @@ PartialIPAddress (const char *in, struct qsockaddr *hostaddr)
else
port = net_hostport;
hostaddr->sa_family = AF_INET;
hostaddr->qsa_family = AF_INET;
((struct sockaddr_in *) hostaddr)->sin_port = htons ((short) port);
((struct sockaddr_in *) hostaddr)->sin_addr.s_addr =
@ -393,7 +393,7 @@ UDP_StringToAddr (const char *string, struct qsockaddr *addr)
sscanf (string, "%d.%d.%d.%d:%d", &ha1, &ha2, &ha3, &ha4, &hp);
ipaddr = (ha1 << 24) | (ha2 << 16) | (ha3 << 8) | ha4;
addr->sa_family = AF_INET;
addr->qsa_family = AF_INET;
((struct sockaddr_in *) addr)->sin_addr.s_addr = htonl (ipaddr);
((struct sockaddr_in *) addr)->sin_port = htons (hp);
return 0;
@ -445,7 +445,7 @@ UDP_GetAddrFromName (const char *name, struct qsockaddr *addr)
if (!hostentry)
return -1;
addr->sa_family = AF_INET;
addr->qsa_family = AF_INET;
((struct sockaddr_in *) addr)->sin_port = htons (net_hostport);
((struct sockaddr_in *) addr)->sin_addr.s_addr =
@ -457,7 +457,7 @@ UDP_GetAddrFromName (const char *name, struct qsockaddr *addr)
int
UDP_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2)
{
if (addr1->sa_family != addr2->sa_family)
if (addr1->qsa_family != addr2->qsa_family)
return -1;
if (((struct sockaddr_in *) addr1)->sin_addr.s_addr !=