diff --git a/include/wx/cpp.h b/include/wx/cpp.h index 60bcd92a7e..2f2b277647 100644 --- a/include/wx/cpp.h +++ b/include/wx/cpp.h @@ -140,20 +140,6 @@ #ifdef HAVE_VARIADIC_MACROS -/* - This is a hack to make it possible to use variadic macros with g++ 3.x even - when using -pedantic[-errors] option: without this, it would complain that - - "anonymous variadic macros were introduced in C99" - - and the option disabling this warning (-Wno-variadic-macros) is only - available in gcc 4.0 and later, so until then this hack is the only thing we - can do. - */ -#if defined(__GNUC__) && __GNUC__ == 3 - #pragma GCC system_header -#endif /* gcc-3.x */ - /* wxCALL_FOR_EACH(what, ...) calls the macro from its first argument, what(pos, x), for every remaining argument 'x', with 'pos' being its 1-based index in diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h index d0b47e4183..b90ee223d8 100644 --- a/include/wx/msw/gccpriv.h +++ b/include/wx/msw/gccpriv.h @@ -77,9 +77,7 @@ #define HAVE_W32API_H #endif #elif defined( __CYGWIN__ ) && !defined( HAVE_W32API_H ) - #if ( __GNUC__ > 2 ) - #define HAVE_W32API_H - #endif + #define HAVE_W32API_H #endif /* check for MinGW/Cygwin w32api version ( releases >= 0.5, only ) */ diff --git a/include/wx/platform.h b/include/wx/platform.h index eee73324ef..34968a0306 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -332,10 +332,6 @@ # include "wx/msw/libraries.h" #endif -#if (defined(__GNUC__) && __GNUC__ < 3) -#define wxNEEDS_CHARPP -#endif - /* Note that wx/msw/gccpriv.h must be included after defining UNICODE and _UNICODE macros as it includes _mingw.h which relies on them being set. diff --git a/include/wx/testing.h b/include/wx/testing.h index f97ed66793..317040130b 100644 --- a/include/wx/testing.h +++ b/include/wx/testing.h @@ -503,11 +503,6 @@ private: */ #ifdef HAVE_VARIADIC_MACROS -// See wx/cpp.h for the explanations of this hack. -#if defined(__GNUC__) && __GNUC__ == 3 - #pragma GCC system_header -#endif /* gcc-3.x */ - #define wxTEST_DIALOG(codeToRun, ...) \ { \ wxTEST_DIALOG_HOOK_CLASS wx_hook(__FILE__, __LINE__, __WXFUNCTION__); \ diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp index 50dfec53c3..3da66cb0ae 100644 --- a/tests/archive/archivetest.cpp +++ b/tests/archive/archivetest.cpp @@ -26,8 +26,7 @@ using std::string; // Check whether member templates can be used // -#if defined __GNUC__ && \ - (__GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)) +#if defined __GNUC__ # define WXARC_MEMBER_TEMPLATES #endif #if defined _MSC_VER && _MSC_VER >= 1310 && !defined __WIN64__ diff --git a/tests/testprec.h b/tests/testprec.h index 57dfe5d17e..4467b7ee36 100644 --- a/tests/testprec.h +++ b/tests/testprec.h @@ -24,8 +24,7 @@ #endif // define wxHAVE_U_ESCAPE if the compiler supports \uxxxx character constants -#if defined(__VISUALC__) || \ - (defined(__GNUC__) && (__GNUC__ >= 3)) +#if defined(__VISUALC__) || defined(__GNUC__) #define wxHAVE_U_ESCAPE // and disable warning that using them results in with MSVC 8+