Some fixups to allow mingw-w64 to be used where mingw32 is currently working.

src/build/Common.gmake

@@ -216,9 +216,13 @@ endif
 BUILDPATH	?=	$(BUILD)
 
 gcc_machine		:= $(findstring mingw32,$(shell ${CC} -dumpmachine))
+gcc_w64                 := $(findstring w64,$(shell ${CC} -dumpmachine))
 ifeq ($(gcc_machine),mingw32)
  os		:= Win32
- CFLAGS	+=	-DMSVCRT_VERSION=0x0800 -m32
+ CFLAGS	+=	-DMSVCRT_VERSION=0x0800 -m32 -DDISABLE_MKSTEMP_DEFINE
+ ifeq ($(gcc_w64),w64)
+  CFLAGS += -DDISABLE_MKSTEMP_DEFINE
+ endif
  LDFLAGS+=	-m32
  WINDRESFLAGS+=	-Fpe-i386
 endif

src/xpdev/genwrap.c

@@ -671,6 +671,8 @@ long xp_random(int n)
 /* There may be a native GNU C Library function to this...					*/
 /****************************************************************************/
 #if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(__WATCOMC__)
+#ifdef __GNUC__
+#if (__GNUC__ < 5)
 char* ultoa(ulong val, char* str, int radix)
 {
 	switch(radix) {
@@ -728,6 +730,8 @@ char* _ui64toa(uint64_t val, char* str, int radix)
 	return str;
 }
 #endif
+#endif
+#endif
 
 /****************************************************************************/
 /* Write the version details of the current operating system into str		*/

src/xpdev/genwrap.h

@@ -232,10 +232,14 @@ extern "C" {
 #endif
 
 #if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(__WATCOMC__)
+#ifdef __GNUC__
+#if (__GNUC__ < 5)
 	DLLEXPORT char* ultoa(ulong, char*, int radix);
 	DLLEXPORT char* _i64toa(int64_t, char*, int radix);
 	DLLEXPORT char* _ui64toa(uint64_t, char*, int radix);
 #endif
+#endif
+#endif
 
 #if defined(__unix__)
 	DLLEXPORT char*	strupr(char* str);