From 6ddbdc417ea3f925bd4e45640ecea9b703e9b567 Mon Sep 17 00:00:00 2001 From: Mark Olsen Date: Sat, 21 May 2005 01:28:51 +0000 Subject: [PATCH] Moved headers around a bit. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1043 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/server/sv_mvd.c | 82 ++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 39 deletions(-) diff --git a/engine/server/sv_mvd.c b/engine/server/sv_mvd.c index 2523d52a4..0c90bfdcb 100644 --- a/engine/server/sv_mvd.c +++ b/engine/server/sv_mvd.c @@ -22,6 +22,49 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #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 +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#ifdef sun +#include +#endif + +#ifdef NeXT +#include +#endif + +#if defined(__MORPHOS__) && !defined(ixemul) +#define closesocket CloseSocket +#define ioctlsocket IoctlSocket +#else +#define closesocket close +#define ioctlsocket ioctl +#endif +#endif + + void SV_MVDStop_f (void); #define demo_size_padding 0x1000 @@ -1888,45 +1931,6 @@ void SV_MVDEasyRecord_f (void) SV_MVD_Record (SV_InitRecordFile(name2)); } - -#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 -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#ifdef sun -#include -#endif - -#ifdef NeXT -#include -#endif - -#define closesocket close -#define ioctlsocket ioctl -#endif - - int MVD_StreamStartListening(int port) { int sock;