Redo the filters based on assumptions discussed in mingw-dvlpr list.

	* include/_mingw.h: Remove __cdecl and __stdcall defines since they will
	always be defined.
	* include/windef.h: Remove definitions for _cdecl, __cdecl, _stdcall,
	__stdcall, _fastcall, __fastcall, WIN32, _WIN32 since they will always
	be defined.

diff --git a/ChangeLog b/ChangeLog
index 6be0fdc..897a399 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,11 @@
        * include/math.h (__DECLSPEC_SUPPORTED): Ditto.
        (HUGE_VAL): Always use GCC's builin value.
        * include/stdlib.h: Modify whitespace.
+       * include/_mingw.h: Remove __cdecl and __stdcall defines since they will
+       always be defined.
+       * include/windef.h: Remove definitions for _cdecl, __cdecl, _stdcall,
+       __stdcall, _fastcall, __fastcall, WIN32, _WIN32 since they will always
+       be defined.
 
 2012-09-07  Earnie Boyd  <earnie@users.sourceforge.net>
 

diff --git a/include/_mingw.h b/include/_mingw.h
index 117ca71..5b36d85 100644 (file)
--- a/include/_mingw.h
+++ b/include/_mingw.h
@@ -101,17 +101,6 @@
 # endif
 #endif
 
-/*
- * The next two defines can cause problems if user code adds the
- * __cdecl attribute like so:
- * void __attribute__ ((__cdecl)) foo(void); 
- */
-#ifndef __cdecl 
-# define __cdecl  __attribute__ ((__cdecl__))
-#endif
-#ifndef __stdcall
-# define __stdcall __attribute__ ((__stdcall__))
-#endif
 #ifndef __int64
 # define __int64 long long
 #endif

diff --git a/include/windef.h b/include/windef.h
index b86aba2..90d7314 100644 (file)
--- a/include/windef.h
+++ b/include/windef.h
@@ -46,12 +46,6 @@ extern "C" {
  * including windows.h or any other method of including the windef.h header.
  */
 #endif
-#ifndef WIN32
-#define WIN32
-#endif
-#ifndef _WIN32
-#define _WIN32
-#endif
 #define FAR
 #define far
 #define NEAR
@@ -88,24 +82,6 @@ extern "C" {
 #endif
 #endif
 
-#ifndef _fastcall
-#define _fastcall __attribute__((fastcall))
-#endif
-#ifndef __fastcall
-#define __fastcall __attribute__((fastcall))
-#endif
-#ifndef _stdcall
-#define _stdcall __attribute__((stdcall))
-#endif
-#ifndef __stdcall
-#define __stdcall __attribute__((stdcall))
-#endif
-#ifndef _cdecl
-#define _cdecl __attribute__((cdecl))
-#endif
-#ifndef __cdecl
-#define __cdecl __attribute__((cdecl))
-#endif
 #ifndef _declspec
 #define _declspec(e) __declspec(e)
 #endif