From 63963b8ddfaf2d0fab39a1e2c0ec04c10e1505d2 Mon Sep 17 00:00:00 2001
From: Steven Edwards <Steven_Ed4153@yahoo.com>
Date: Fri, 5 Apr 2002 21:18:10 +0000
Subject: [PATCH] Fixed mingw32 warning about stdcall and fastcall being
 redefined.

---
 include/winnt.h | 46 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/include/winnt.h b/include/winnt.h
index d39cce18d24..f701d86ca9e 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -78,21 +78,50 @@
 #endif  /* __i386__ */
 
 #ifndef __WINE__
-#define pascal      __stdcall
-#define _pascal     __stdcall
-#define _stdcall    __stdcall
-#define _fastcall   __stdcall
-#define __fastcall  __stdcall
-#define __export    __stdcall
-#define cdecl       __cdecl
-#define _cdecl      __cdecl
 
+#ifndef pascal
+#define pascal      __stdcall
+#endif
+#ifndef _pascal
+#define _pascal     __stdcall
+#endif
+#ifndef _stdcall
+#define _stdcall    __stdcall
+#endif
+#ifndef _fastcall
+#define _fastcall   __stdcall
+#endif
+#ifndef __fastcall
+#define __fastcall  __stdcall
+#endif
+#ifndef __export
+#define __export    __stdcall
+#endif
+#ifndef cdecl
+#define cdecl       __cdecl
+#endif
+#ifndef _cdecl
+#define _cdecl      __cdecl
+#endif
+
+#ifndef near
 #define near
+#endif
+#ifndef far
 #define far
+#endif
+#ifndef _near
 #define _near
+#endif
+#ifndef _far
 #define _far
+#endif
+#ifndef NEAR
 #define NEAR
+#endif
+#ifndef FAR
 #define FAR
+#endif
 
 #ifndef _declspec
 #define _declspec(x)
@@ -100,6 +129,7 @@
 #ifndef __declspec
 #define __declspec(x)
 #endif
+
 #endif /* __WINE__ */
 
 #define CALLBACK    __stdcall