From d17ca9286b04e8b817e884945e6abd200d5564a2 Mon Sep 17 00:00:00 2001
From: Mark Olsen <isthisinuse@users.sourceforge.net>
Date: Tue, 29 Nov 2005 13:22:58 +0000
Subject: [PATCH] Use netinc.h

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1622 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/server/sv_master.c | 46 +------------------------------------
 engine/server/sv_mvd.c    | 48 ++-------------------------------------
 engine/sndcodec/snd_vc.c  | 34 +--------------------------
 3 files changed, 4 insertions(+), 124 deletions(-)

diff --git a/engine/server/sv_master.c b/engine/server/sv_master.c
index e7499dd0b..65c47e099 100644
--- a/engine/server/sv_master.c
+++ b/engine/server/sv_master.c
@@ -7,53 +7,9 @@
 #ifdef _MSC_VER
 #include "wsipx.h"
 #endif
-
-#define EWOULDBLOCK	WSAEWOULDBLOCK
-#define EMSGSIZE	WSAEMSGSIZE
-#define ECONNRESET	WSAECONNRESET
-#define ECONNABORTED	WSAECONNABORTED
-#define ECONNREFUSED	WSAECONNREFUSED
-#define EADDRNOTAVAIL	WSAEADDRNOTAVAIL
-#define EAFNOSUPPORT	WSAEAFNOSUPPORT
-
-#define qerrno WSAGetLastError()
-#else
-#define qerrno errno
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/param.h>
-#include <sys/ioctl.h>
-#include <sys/uio.h>
-#include <arpa/inet.h>
-#include <errno.h>
-
-#if defined(sun)
-#include <unistd.h>
 #endif
 
-#ifdef sun
-#include <sys/filio.h>
-#endif
-
-#ifdef NeXT
-#include <libc.h>
-#endif
-
-#define closesocket close
-#define ioctlsocket ioctl
-#endif
-
-
-
-
-
-
-
-
-
+#include "netinc.h"
 
 //quake1 protocol
 //
diff --git a/engine/server/sv_mvd.c b/engine/server/sv_mvd.c
index ef41dc979..dd960e50e 100644
--- a/engine/server/sv_mvd.c
+++ b/engine/server/sv_mvd.c
@@ -20,54 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "qwsvdef.h"
 #ifndef CLIENTONLY
+
 #include "winquake.h"
 
-#ifdef _WIN32
-
-#define EWOULDBLOCK	WSAEWOULDBLOCK
-#define EMSGSIZE	WSAEMSGSIZE
-#define ECONNRESET	WSAECONNRESET
-#define ECONNABORTED	WSAECONNABORTED
-#define ECONNREFUSED	WSAECONNREFUSED
-#define EADDRNOTAVAIL	WSAEADDRNOTAVAIL
-
-#define qerrno WSAGetLastError()
-#else
-#define qerrno errno
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/param.h>
-#include <sys/ioctl.h>
-#include <sys/uio.h>
-#include <arpa/inet.h>
-#include <errno.h>
-
-#include <unistd.h>
-
-#ifdef sun
-#include <sys/filio.h>
-#endif
-
-#ifdef NeXT
-#include <libc.h>
-#endif
-
-#if defined(__MORPHOS__) && !defined(ixemul)
-#define closesocket CloseSocket
-#define ioctlsocket IoctlSocket
-#else
-#define closesocket close
-#define ioctlsocket ioctl
-#endif
-
-#ifndef INVALID_SOCKET
-#define INVALID_SOCKET -1
-#endif
-
-#endif
+#include "netinc.h"
 
 
 void SV_MVDStop_f (void);
diff --git a/engine/sndcodec/snd_vc.c b/engine/sndcodec/snd_vc.c
index a04aa7e20..2faa2a1b5 100644
--- a/engine/sndcodec/snd_vc.c
+++ b/engine/sndcodec/snd_vc.c
@@ -13,41 +13,9 @@
 #include "quakedef.h"
 #ifdef _WIN32
 #include "winquake.h"
-
-#define EWOULDBLOCK	WSAEWOULDBLOCK
-#define EMSGSIZE	WSAEMSGSIZE
-#define ECONNRESET	WSAECONNRESET
-#define ECONNABORTED	WSAECONNABORTED
-#define ECONNREFUSED	WSAECONNREFUSED
-#define EADDRNOTAVAIL	WSAEADDRNOTAVAIL
-
-#define qerrno WSAGetLastError()
-#else
-#define qerrno errno
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/param.h>
-#include <sys/ioctl.h>
-#include <sys/uio.h>
-#include <arpa/inet.h>
-#include <errno.h>
-
-#include <unistd.h>
-
-#ifdef sun
-#include <sys/filio.h>
 #endif
 
-#ifdef NeXT
-#include <libc.h>
-#endif
-
-#define closesocket close
-#define ioctlsocket ioctl
-#endif
+#include "netinc.h"
 
 #include "voicechat.h"