From e35450bde7d0b65b5389c15559e88e7866b803fb Mon Sep 17 00:00:00 2001 From: Earnie Boyd Date: Fri, 31 Aug 2012 12:47:27 -0400 Subject: [PATCH] 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/wingdi.h: Remove unneeded filters based on the assumptions. * include/wininet.h: Ditto. * include/winocotl.h: Ditto. * include/winldap.h:Ditto. * include/winnls.h: Ditto. * include/_mingw.h: Give an error if __GNUC__ isn't defined or isn't >= version 3.4.5. --- ChangeLog | 7 +++++++ include/_mingw.h | 8 ++++++++ include/wingdi.h | 2 -- include/wininet.h | 2 -- include/winioctl.h | 2 -- include/winldap.h | 11 ----------- include/winnetwk.h | 2 -- include/winnls.h | 2 -- 8 files changed, 15 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92d4ff8..019181b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,13 @@ * include/wsahelp.h: Ditto. * include/wsipx.h: Ditto. * include/wsnetbs.h: Ditto. + * include/wingdi.h: Ditto. + * include/wininet.h: Ditto. + * include/winocotl.h: Ditto. + * include/winldap.h:Ditto. + * include/winnls.h: Ditto. + * include/_mingw.h: Give an error if __GNUC__ isn't defined or isn't >= + version 3.4.5. 2012-08-28 Earnie Boyd diff --git a/include/_mingw.h b/include/_mingw.h index f35ede4..ad6bbc6 100644 --- a/include/_mingw.h +++ b/include/_mingw.h @@ -36,6 +36,14 @@ #pragma GCC system_header +#ifndef __GNUC__ +#error ERROR: You must use a GNU Compiler. +#endif + +#if (__GNUC__ < 3 || !defined(__GNUC__MINOR__) || (__GNUC__ = 3 && __GNUC_MINOR__ < 4) || (__GNUC__ = 3 && __GNUC_MINOR__ >= 4 && __GNUC_PATCHLEVEL__ < 5)) +#error ERROR: You must use a GNU Compiler version >= 3.4.5. +#endif + /* These are defined by the user (or the compiler) to specify how identifiers are imported from a DLL. diff --git a/include/wingdi.h b/include/wingdi.h index 9ecbd51..6921ddb 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1,9 +1,7 @@ #ifndef _WINGDI_H #define _WINGDI_H #define _WINGDI_ -#if __GNUC__ >= 3 #pragma GCC system_header -#endif #ifdef __cplusplus extern "C" { diff --git a/include/wininet.h b/include/wininet.h index cadd305..5101fd3 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1,8 +1,6 @@ #ifndef _WININET_H #define _WININET_H -#if __GNUC__ >=3 #pragma GCC system_header -#endif #include #ifdef __cplusplus diff --git a/include/winioctl.h b/include/winioctl.h index efa0b73..aee2789 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -1,8 +1,6 @@ #ifndef _WINIOCTL_H #define _WINIOCTL_H -#if __GNUC__ >=3 #pragma GCC system_header -#endif #ifdef __cplusplus extern "C" { diff --git a/include/winldap.h b/include/winldap.h index cf7083b..cf58e0a 100644 --- a/include/winldap.h +++ b/include/winldap.h @@ -17,28 +17,17 @@ #ifndef _WINLDAP_H #define _WINLDAP_H -#if __GNUC__ >= 3 #pragma GCC system_header -#endif -#ifndef _SCHANNEL_H #include -#endif - -#ifndef _WINBER_H #include -#endif #ifndef WINLDAPAPI #define WINLDAPAPI DECLSPEC_IMPORT #endif #ifndef _WINLDAP_DEPRECATED -#if (( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3) #define _WINLDAP_DEPRECATED __attribute__((__deprecated__)) -#else -#define _WINLDAP_DEPRECATED -#endif #endif #include diff --git a/include/winnetwk.h b/include/winnetwk.h index 022bf8b..983af36 100644 --- a/include/winnetwk.h +++ b/include/winnetwk.h @@ -1,8 +1,6 @@ #ifndef _WINNETWK_H #define _WINNETWK_H -#if __GNUC__ >=3 #pragma GCC system_header -#endif #ifdef __cplusplus extern "C" { diff --git a/include/winnls.h b/include/winnls.h index b03eb33..d638e70 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -1,8 +1,6 @@ #ifndef _WINNLS_H #define _WINNLS_H -#if __GNUC__ >= 3 #pragma GCC system_header -#endif #ifndef WINBASEAPI #ifdef __W32API_USE_DLLIMPORT__ -- 2.11.0