various msvc fixes thanks to muzzy (hope he doesn't give up:)

configure.ac

@@ -51,7 +51,6 @@ case "$host_os" in
 	mingw32*)
 		mingw=yes
 		CFLAGS="$CFLAGS -I\$(top_srcdir)/include/win32"
-		CFLAGS="$CFLAGS -I\$(top_srcdir)/include/win32/resources"
 		if test "$host" != "$build"; then
 			case "$build_os" in
 				cygwin*)

include/QF/sys.h

@@ -88,10 +88,10 @@ void Sys_PageIn (void *ptr, int size);
 //
 void Sys_DebugLog(const char *file, const char *fmt, ...) __attribute__((format(printf,2,3)));
 
-#define SYS_CHECKMEM(x) 											\
-	do {															\
-		if (!(x))													\
-			Sys_Error ("%s: Failed to allocate memory.", __func__);	\
+#define SYS_CHECKMEM(x) 												\
+	do {																\
+		if (!(x))														\
+			Sys_Error ("%s: Failed to allocate memory.", __FUNCTION__);	\
 	} while (0)
 
 #endif // __sys_h

include/qstring.h

@@ -32,6 +32,8 @@
 #include <sys/types.h>
 #include <stdarg.h>
 
+#include "QF/gcc_attr.h"
+
 const char * Q_strcasestr (const char *haystack, const char *needle);
 size_t Q_strnlen (const char *s, size_t maxlen);
 size_t Q_snprintfz (char *dest, size_t size, const char *fmt, ...) __attribute__((format(printf,3,4)));

libs/video/targets/vid_mgl.c

@@ -49,7 +49,7 @@ static const char rcsid[] =
 
 #include "d_local.h"
 #include "in_win.h"
-#include "resource.h"
+#include "win32/resources/resource.h"
 #include "winquake.h"
 
 #define	MINIMUM_MEMORY	0x550000

libs/video/targets/vid_wgl.c

@@ -52,7 +52,7 @@ static const char rcsid[] =
 #include "compat.h"
 #include "in_win.h"
 #include "r_cvar.h"
-#include "resource.h"
+#include "win32/resources/resource.h"
 #include "sbar.h"
 
 extern const char *gl_renderer;

nq/source/locs.c

@@ -37,6 +37,10 @@ static const char rcsid[] =
 # include <strings.h>
 #endif
 
+#ifdef _MSC_VER
+# define _POSIX_
+#endif
+
 #include <limits.h>
 
 #include "compat.h"

nq/source/net_udp.c

@@ -220,7 +220,7 @@ UDP_OpenSocket (int port)
 	return newsocket;
 
   ErrorReturn:
-	close (newsocket);
+	UDP_CloseSocket (newsocket);
 	return -1;
 }
 

nq/source/net_wipx.c

@@ -37,7 +37,9 @@ static const char rcsid[] =
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/qargs.h"
+#include "QF/sys.h"
 
+#include "game.h"
 #include "net_wins.h"
 #include "net_wipx.h"
 

nq/source/sys_win.c

@@ -33,7 +33,7 @@ static const char rcsid[] =
 
 #include "winquake.h"
 #include "conproc.h"
-#include "resource.h"
+#include "win32/resources/resource.h"
 
 #include "QF/console.h"
 #include "QF/cvar.h"

qw/source/cl_sys_win.c

@@ -56,7 +56,7 @@ static const char rcsid[] =
 #include "compat.h"
 #include "host.h"
 #include "net.h"
-#include "resource.h"
+#include "win32/resources/resource.h"
 
 #define MAXIMUM_WIN_MEMORY	0x1000000
 #define MINIMUM_WIN_MEMORY	0x0c00000

qw/source/locs.c

@@ -37,6 +37,10 @@ static const char rcsid[] =
 # include <strings.h>
 #endif
 
+#ifdef _MSC_VER
+# define _POSIX_
+#endif
+
 #include <limits.h>
 
 #include "QF/console.h"

tools/3dfx_stub/gls_trace.c

@@ -36,7 +36,7 @@
 #include <stdlib.h>
 
 #define TRACE do { \
-	puts (__func__);\
+	puts (__FUNCTION__);\
 } while (0)
 
 void

tools/cross/cross-make.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -x
 HOST_CC=gcc
 PATH=$PATH:/usr/local/cross-tools/bin:/usr/local/cross-tools/i386-mingw32msvc/bin
 export HOST_CC

tools/gl_stub/gls_trace.c

@@ -10,7 +10,7 @@ typedef struct __GLXcontextRec *GLXContext;
 typedef XID GLXDrawable;
 
 #define TRACE do { \
-	puts (__func__);\
+	puts (__FUNCTION__);\
 } while (0)
 
 void