From 3aa26a794e24a298493a2bc9d70fbd9aebf6437a Mon Sep 17 00:00:00 2001
From: grischka <grischka>
Date: Tue, 26 Jan 2010 22:18:03 +0100
Subject: [PATCH] win32: adjust for mingw32 winapi packages

Note: the files in tcc/win32/include/winapi are now from the
mingw-w64 project, however with this fix using mingw32 winapi
should still work.
---
 win32/include/_mingw.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/win32/include/_mingw.h b/win32/include/_mingw.h
index d876625d..7a1891cd 100644
--- a/win32/include/_mingw.h
+++ b/win32/include/_mingw.h
@@ -18,6 +18,13 @@
 #ifndef __MINGW_H
 #define __MINGW_H
 
+/* some winapi files define these before including _mingw.h --> */
+#undef NULL
+#undef __cdecl
+#undef _X86_
+#undef WIN32
+/* <-- */
+
 #include <stddef.h>
 #include <stdarg.h>
 
@@ -111,6 +118,10 @@ typedef struct threadmbcinfostruct *pthreadmbcinfo;
 typedef struct localeinfo_struct _locale_tstruct,*_locale_t;
 
 /* for winapi */
+#define _ANONYMOUS_UNION
+#define _ANONYMOUS_STRUCT
+#define DECLSPEC_NORETURN
+#define DECLARE_STDCALL_P(type) __stdcall type
 #define WIN32_LEAN_AND_MEAN
 #define NOSERVICE 1
 #define NOMCX 1