fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-02 22:11:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

* net_sys.h: revert previous commit undefining EWOULDBLOCK and

Browse source 
ECONNREFUSED for windows.  define new macros NET_EWOULDBLOCK and
  NET_ECONNREFUSED for both unix and for windows and change the
  users accordingly.
* net_udp.c, net_wins.c, net_wipx.c:
  adjust for the new NET_EWOULDBLOCK and NET_ECONNREFUSED macros.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@398 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2011-01-12 20:10:34 +00:00
parent 744c346b3f
commit 10e8c574bd
4 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Quake/net_sys.h
View file

@ -111,6 +111,9 @@ typedef int socklen_t;
#define closesocket close #define closesocket close
#endif #endif
#define NET_EWOULDBLOCK EWOULDBLOCK
#define NET_ECONNREFUSED ECONNREFUSED
#define socketerror(x) strerror((x)) #define socketerror(x) strerror((x))
/* Verify that we defined HAVE_SA_LEN correctly: */ /* Verify that we defined HAVE_SA_LEN correctly: */
@ -142,12 +145,8 @@ typedef int socklen_t;
typedef SOCKET sys_socket_t; typedef SOCKET sys_socket_t;
#define SOCKETERRNO WSAGetLastError() #define SOCKETERRNO WSAGetLastError()
/* the new MS SDKs define the following two, #define NET_EWOULDBLOCK WSAEWOULDBLOCK
* so we must undefine them before redefining. */ #define NET_ECONNREFUSED WSAECONNREFUSED
#undef EWOULDBLOCK
#define EWOULDBLOCK WSAEWOULDBLOCK
#undef ECONNREFUSED
#define ECONNREFUSED WSAECONNREFUSED
/* must #include "wsaerror.h" for this : */ /* must #include "wsaerror.h" for this : */
#define socketerror(x) __WSAE_StrError((x)) #define socketerror(x) __WSAE_StrError((x))

4
Quake/net_udp.c
View file

@ -261,7 +261,7 @@ int UDP_Read (sys_socket_t socketid, byte *buf, int len, struct qsockaddr *addr)
if (ret == SOCKET_ERROR) if (ret == SOCKET_ERROR)
{ {
int err = SOCKETERRNO; int err = SOCKETERRNO;
if (err == EWOULDBLOCK || err == ECONNREFUSED) if (err == NET_EWOULDBLOCK || err == NET_ECONNREFUSED)
return 0; return 0;
Con_SafePrintf ("UDP_Read, recvfrom: %s\n", socketerror(err)); Con_SafePrintf ("UDP_Read, recvfrom: %s\n", socketerror(err));
} }
@ -319,7 +319,7 @@ int UDP_Write (sys_socket_t socketid, byte *buf, int len, struct qsockaddr *addr
if (ret == SOCKET_ERROR) if (ret == SOCKET_ERROR)
{ {
int err = SOCKETERRNO; int err = SOCKETERRNO;
if (err == EWOULDBLOCK) if (err == NET_EWOULDBLOCK)
return 0; return 0;
Con_SafePrintf ("UDP_Write, sendto: %s\n", socketerror(err)); Con_SafePrintf ("UDP_Write, sendto: %s\n", socketerror(err));
} }

4
Quake/net_wins.c
View file

@ -354,7 +354,7 @@ int WINS_Read (sys_socket_t socketid, byte *buf, int len, struct qsockaddr *addr
if (ret == SOCKET_ERROR) if (ret == SOCKET_ERROR)
{ {
int err = SOCKETERRNO; int err = SOCKETERRNO;
if (err == EWOULDBLOCK || err == ECONNREFUSED) if (err == NET_EWOULDBLOCK || err == NET_ECONNREFUSED)
return 0; return 0;
Con_SafePrintf ("WINS_Read, recvfrom: %s\n", socketerror(err)); Con_SafePrintf ("WINS_Read, recvfrom: %s\n", socketerror(err));
} }
@ -413,7 +413,7 @@ int WINS_Write (sys_socket_t socketid, byte *buf, int len, struct qsockaddr *add
if (ret == SOCKET_ERROR) if (ret == SOCKET_ERROR)
{ {
int err = SOCKETERRNO; int err = SOCKETERRNO;
if (err == EWOULDBLOCK) if (err == NET_EWOULDBLOCK)
return 0; return 0;
Con_SafePrintf ("WINS_Write, sendto: %s\n", socketerror(err)); Con_SafePrintf ("WINS_Write, sendto: %s\n", socketerror(err));
} }

4
Quake/net_wipx.c
View file

@ -251,7 +251,7 @@ int WIPX_Read (sys_socket_t handle, byte *buf, int len, struct qsockaddr *addr)
if (ret == SOCKET_ERROR) if (ret == SOCKET_ERROR)
{ {
int err = SOCKETERRNO; int err = SOCKETERRNO;
if (err == EWOULDBLOCK || err == ECONNREFUSED) if (err == NET_EWOULDBLOCK || err == NET_ECONNREFUSED)
return 0; return 0;
Con_SafePrintf ("WIPX_Read, recvfrom: %s\n", socketerror(err)); Con_SafePrintf ("WIPX_Read, recvfrom: %s\n", socketerror(err));
} }
@ -290,7 +290,7 @@ int WIPX_Write (sys_socket_t handle, byte *buf, int len, struct qsockaddr *addr)
if (ret == SOCKET_ERROR) if (ret == SOCKET_ERROR)
{ {
int err = SOCKETERRNO; int err = SOCKETERRNO;
if (err == EWOULDBLOCK) if (err == NET_EWOULDBLOCK)
return 0; return 0;
Con_SafePrintf ("WIPX_Write, sendto: %s\n", socketerror(err)); Con_SafePrintf ("WIPX_Write, sendto: %s\n", socketerror(err));
} }