More on assuming GCC is greater than or equal to version 3.5.4 and that

	GCC is the only compiler to be used for MinGW.org.

	* include/winnt.h: Remove unneeded filters based on the assumptions.
	(_SYSTEM_POWER_INFORMATION): Introduce filter for _WIN32_WINNT >=
	Windows XP.
	* include/winperf.h: Remove unneeded filters based on the assumptions.
	* include/winreg.h: Ditto.
	* include/winresrc.h: Ditto.
	* include/winsnmp.h: Ditto.
	* include/winsock.h: Ditto.
	* include/winsock2.h: Ditto.
	* include/winspool.h: Ditto.
	* include/winsvc.h: Ditto.
	* include/winuser.h: Ditto.
	* include/winver.h: Ditto.
	* include/ws2spi.h: Ditto.
	* include/ws2tcpip.h: Ditto.
	* include/wsahelp.h: Ditto.
	* include/wsipx.h: Ditto.
	* include/wsnetbs.h: Ditto.

diff --git a/ChangeLog b/ChangeLog
index a7aff73..92d4ff8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2012-08-31  Earnie Boyd  <earnie@users.sourceforge.net>
+
+       More on assuming GCC is greater than or equal to version 3.5.4 and that
+       GCC is the only compiler to be used for MinGW.org.
+
+       * include/winnt.h: Remove unneeded filters based on the assumptions.
+       (_SYSTEM_POWER_INFORMATION): Introduce filter for _WIN32_WINNT >=
+       Windows XP.
+       * include/winperf.h: Remove unneeded filters based on the assumptions.
+       * include/winreg.h: Ditto.
+       * include/winresrc.h: Ditto.
+       * include/winsnmp.h: Ditto.
+       * include/winsock.h: Ditto.
+       * include/winsock2.h: Ditto.
+       * include/winspool.h: Ditto.
+       * include/winsvc.h: Ditto.
+       * include/winuser.h: Ditto.
+       * include/winver.h: Ditto.
+       * include/ws2spi.h: Ditto.
+       * include/ws2tcpip.h: Ditto.
+       * include/wsahelp.h: Ditto.
+       * include/wsipx.h: Ditto.
+       * include/wsnetbs.h: Ditto.
+
 2012-08-28  Earnie Boyd  <earnie@users.sourceforge.net>
 
        We are going to assume that MinGW is using GCC version greater than or

diff --git a/include/winnt.h b/include/winnt.h
index d650bf8..965b6fa 100644 (file)
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -1,8 +1,6 @@
 #ifndef _WINNT_H
 #define _WINNT_H
-#if __GNUC__ >= 3
 #pragma GCC system_header
-#endif
 
 /* translate GCC target defines to MS equivalents. Keep this synchronized
    with windows.h. */
@@ -44,11 +42,7 @@ extern "C" {
 #endif
 
 #ifndef DECLSPEC_ALIGN
-#ifdef __GNUC__
 #define DECLSPEC_ALIGN(x) __attribute__((aligned(x)))
-#else
-#define DECLSPEC_ALIGN(x)
-#endif
 #endif
 
 #ifndef DECLSPEC_SELECTANY
@@ -60,11 +54,7 @@ extern "C" {
 #endif
 
 #ifndef FORCEINLINE
-#if (__GNUC__ >= 3)
 #define FORCEINLINE __inline  __attribute__((always_inline))
-#else
-#define FORCEINLINE __inline
-#endif
 #endif
 
 #ifndef C_ASSERT
@@ -155,31 +145,26 @@ typedef HANDLE *PHANDLE,*LPHANDLE;
 typedef DWORD LCID;
 typedef PDWORD PLCID;
 typedef WORD LANGID;
-#ifdef __GNUC__
+
 #define _HAVE_INT64
 #define _INTEGRAL_MAX_BITS 64
 #undef __int64
 #define __int64 long long
-#elif defined(__WATCOMC__) && (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64 )
-#define _HAVE_INT64
-#endif /* __GNUC__/__WATCOMC */
-#if defined(_HAVE_INT64) || (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64)
+
 typedef __int64 LONGLONG;
 typedef unsigned __int64 DWORDLONG;
-#else
-typedef double LONGLONG,DWORDLONG;
-#endif
+
 typedef LONGLONG *PLONGLONG;
 typedef DWORDLONG *PDWORDLONG;
 typedef DWORDLONG ULONGLONG,*PULONGLONG;
 typedef LONGLONG USN;
-#ifdef _HAVE_INT64
+
 #define Int32x32To64(a,b) ((LONGLONG)(a)*(LONGLONG)(b))
 #define UInt32x32To64(a,b) ((DWORDLONG)(a)*(DWORDLONG)(b))
 #define Int64ShllMod32(a,b) ((DWORDLONG)(a)<<(b))
 #define Int64ShraMod32(a,b) ((LONGLONG)(a)>>(b))
 #define Int64ShrlMod32(a,b) ((DWORDLONG)(a)>>(b))
-#endif
+
 #define ANSI_NULL '\0'
 #define UNICODE_NULL L'\0'
 typedef BYTE BOOLEAN,*PBOOLEAN;
@@ -3819,7 +3804,7 @@ typedef enum _POWER_INFORMATION_LEVEL {
 #if (_WIN32_WINNT >= 0x0500)
 typedef LONG (WINAPI *PVECTORED_EXCEPTION_HANDLER)(PEXCEPTION_POINTERS);
 #endif
-#if 1 /* (WIN32_WINNT >= 0x0500) */
+#if (WIN32_WINNT >= _WIN32_WINNT_WINXP)
 typedef struct _SYSTEM_POWER_INFORMATION {
        ULONG  MaxIdlenessAllowed;
        ULONG  Idleness;
@@ -3939,8 +3924,6 @@ ULONGLONG WINAPI VerSetConditionMask(ULONGLONG,DWORD,BYTE);
 #endif
 
 #ifdef _X86_
-#if defined(__GNUC__)
-#if (__GNUC__ >= 3)
 /* Support -masm=intel.  */
 static __inline__ PVOID GetCurrentFiber(void)
 {
@@ -3976,42 +3959,7 @@ static __inline__ struct _TEB * NtCurrentTeb(void)
     return ret;
 }
 
-#else /* __GNUC__ >= 3 */
-static __inline__ PVOID GetCurrentFiber(void)
-{
-    void* ret;
-    __asm__ __volatile__ (
-       "movl   %%fs:0x10,%0"
-       : "=r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */
-       );
-    return ret;
-}
-
-static __inline__ PVOID GetFiberData(void)
-{
-    void* ret;
-    __asm__ __volatile__ (
-       "movl   %%fs:0x10,%0\n\t"
-       "movl   (%0),%0"
-       : "=r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */
-       );
-    return ret;
-}
-
-static __inline__ struct _TEB * NtCurrentTeb(void)
-{
-    struct _TEB *ret;
-
-    __asm__ __volatile__ (
-        "movl %%fs:0x18, %0\n"
-        : "=r" (ret)
-        : /* no inputs */
-    );
-    return ret;
-}
-#endif /* __GNUC__ >= 3 */
-
-#else
+#else /* ! _X86_ */
 
 PVOID GetCurrentFiber(void);
 #pragma aux GetCurrentFiber = \
@@ -4032,7 +3980,6 @@ struct _TEB * NtCurrentTeb(void);
         value [eax] \
         modify [eax];
         
-#endif /* __GNUC__ */
 #endif /* _X86_ */
 
 #if _WIN32_WINNT >= _WIN32_WINNT_VISTA

diff --git a/include/winperf.h b/include/winperf.h
index 75e29a8..967e813 100644 (file)
--- a/include/winperf.h
+++ b/include/winperf.h
@@ -1,8 +1,6 @@
 #ifndef _WINPERF_H
 #define _WINPERF_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/winreg.h b/include/winreg.h
index 81aebba..111c802 100644 (file)
--- a/include/winreg.h
+++ b/include/winreg.h
@@ -1,8 +1,6 @@
 #ifndef _WINREG_H
 #define _WINREG_H
-#if __GNUC__ >= 3
 #pragma GCC system_header
-#endif
 
 #ifndef WINADVAPI
 #define WINADVAPI

diff --git a/include/winresrc.h b/include/winresrc.h
index 79a5d8e..de0a715 100644 (file)
--- a/include/winresrc.h
+++ b/include/winresrc.h
@@ -1,8 +1,6 @@
 #ifndef _WINRESRC_H
 #define _WINRESRC_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
 #define WIN32_LEAN_AND_MEAN
 #include <winuser.h>

diff --git a/include/winsnmp.h b/include/winsnmp.h
index bfed386..d0ece8f 100644 (file)
--- a/include/winsnmp.h
+++ b/include/winsnmp.h
@@ -23,9 +23,7 @@
 
 #ifndef _WINSNMP_H
 #define _WINSNMP_H
-#if __GNUC__ >= 3
 #pragma GCC system_header
-#endif
 
 #ifndef _WINDOWS_H
 #include <windows.h>

diff --git a/include/winsock.h b/include/winsock.h
index 929c103..e56dc3d 100644 (file)
--- a/include/winsock.h
+++ b/include/winsock.h
@@ -10,9 +10,7 @@
 
 #ifndef _WINSOCK_H
 #define _WINSOCK_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
 #define _GNU_H_WINDOWS32_SOCKETS
 

diff --git a/include/winsock2.h b/include/winsock2.h
index 0279227..33546ef 100644 (file)
--- a/include/winsock2.h
+++ b/include/winsock2.h
@@ -13,9 +13,7 @@
 #if !(defined _WINSOCK2_H || defined _WINSOCK_H)
 #define _WINSOCK2_H
 #define _WINSOCK_H /* to prevent later inclusion of winsock.h */
-#if __GNUC__ >= 3
 #pragma GCC system_header
-#endif
 
 #define _GNU_H_WINDOWS32_SOCKETS
 

diff --git a/include/winspool.h b/include/winspool.h
index a7d4892..cb03f68 100644 (file)
--- a/include/winspool.h
+++ b/include/winspool.h
@@ -1,8 +1,6 @@
 #ifndef _WINSPOOL_H
 #define _WINSPOOL_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/winsvc.h b/include/winsvc.h
index a51440f..f0b3b05 100644 (file)
--- a/include/winsvc.h
+++ b/include/winsvc.h
@@ -1,8 +1,6 @@
 #ifndef _WINSVC_H
 #define _WINSVC_H
-#if __GNUC__ >= 3
 #pragma GCC system_header
-#endif
 
 #ifndef WINADVAPI
 #define WINADVAPI

diff --git a/include/winuser.h b/include/winuser.h
index 76f4935..68e24a6 100644 (file)
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -1,8 +1,6 @@
 #ifndef _WINUSER_H
 #define _WINUSER_H
-#if __GNUC__ >= 3
 #pragma GCC system_header
-#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -552,10 +550,8 @@ extern "C" {
 #define IS_INTRESOURCE(i) (((ULONG_PTR)(i) >> 16) == 0)
 #define MAKEINTRESOURCEA(i) (LPSTR)((DWORD)((WORD)(i)))
 #define MAKEINTRESOURCEW(i) (LPWSTR)((DWORD)((WORD)(i)))
-#ifndef XFree86Server
 # define RT_CURSOR MAKEINTRESOURCE(1)
 # define RT_FONT MAKEINTRESOURCE(8)
-#endif /* ndef XFree86Server */
 #define RT_BITMAP MAKEINTRESOURCE(2)
 #define RT_ICON MAKEINTRESOURCE(3)
 #define RT_MENU MAKEINTRESOURCE(4)

diff --git a/include/winver.h b/include/winver.h
index f5a0dab..573bbf1 100644 (file)
--- a/include/winver.h
+++ b/include/winver.h
@@ -1,8 +1,6 @@
 #ifndef _WINVER_H
 #define _WINVER_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/ws2spi.h b/include/ws2spi.h
index 7961710..b7a1adb 100644 (file)
--- a/include/ws2spi.h
+++ b/include/ws2spi.h
@@ -17,9 +17,7 @@
  */
 #ifndef _WS2SPI_H
 #define _WS2SPI_H
-#if __GNUC__ >= 3
 #pragma GCC system_header
-#endif
 
 #include <winsock2.h>
 

diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h
index 2eac66a..0a731c8 100644 (file)
--- a/include/ws2tcpip.h
+++ b/include/ws2tcpip.h
@@ -8,9 +8,7 @@
 
 #ifndef _WS2TCPIP_H
 #define _WS2TCPIP_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
 #if (defined _WINSOCK_H && !defined _WINSOCK2_H)
 #error "ws2tcpip.h is not compatible with winsock.h. Include winsock2.h instead."

diff --git a/include/wsahelp.h b/include/wsahelp.h
index 8ff876e..7dfbc79 100644 (file)
--- a/include/wsahelp.h
+++ b/include/wsahelp.h
@@ -1,8 +1,6 @@
 #ifndef _WSAHELP_H
 #define _WSAHELP_H
-#if __GNUC__ >= 3
 #pragma GCC system_header
-#endif
 
 #include <winsock2.h>
 #include <ntsecapi.h>

diff --git a/include/wsipx.h b/include/wsipx.h
index ff831a1..a8a6909 100644 (file)
--- a/include/wsipx.h
+++ b/include/wsipx.h
@@ -3,9 +3,7 @@
 
 #ifndef _WSIPX_H
 #define _WSIPX_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/wsnetbs.h b/include/wsnetbs.h
index e435b5d..c5f02bc 100644 (file)
--- a/include/wsnetbs.h
+++ b/include/wsnetbs.h
@@ -1,8 +1,6 @@
 #ifndef _WSNETBS_H
 #define _WSNETBS_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
 #define NETBIOS_NAME_LENGTH    16
 #define NETBIOS_UNIQUE_NAME    0