Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / cpp.h

diff --git a/include/wx/cpp.h b/include/wx/cpp.h
index f8b1d2ef58d521d3c9eecb0e80937a066d62a18b..b5ce014e4d26a839e3fc9fa88c85f219ea8b61c8 100644 (file)
--- a/include/wx/cpp.h
+++ b/include/wx/cpp.h
@@ -3,7 +3,6 @@
  *  Purpose:     Various preprocessor helpers
  *  Author:      Vadim Zeitlin
  *  Created:     2006-09-30
  *  Purpose:     Various preprocessor helpers
  *  Author:      Vadim Zeitlin
  *  Created:     2006-09-30

- *  RCS-ID:      $Id$

  *  Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
  *  Licence:     wxWindows licence
  */
  *  Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
  *  Licence:     wxWindows licence
  */


@@ -13,6 +12,8 @@
 #ifndef _WX_CPP_H_
 #define _WX_CPP_H_
 
 #ifndef _WX_CPP_H_
 #define _WX_CPP_H_
 

+#include "wx/compiler.h"    /* wxCHECK_XXX_VERSION() macros */
+

 /* wxCONCAT works like preprocessor ## operator but also works with macros */
 #define wxCONCAT_HELPER(text, line) text ## line
 
 /* wxCONCAT works like preprocessor ## operator but also works with macros */
 #define wxCONCAT_HELPER(text, line) text ## line
 


@@ -130,7 +131,7 @@
     #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
         (defined(__cplusplus) && __cplusplus >= 201103L)
         #define HAVE_VARIADIC_MACROS
     #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
         (defined(__cplusplus) && __cplusplus >= 201103L)
         #define HAVE_VARIADIC_MACROS

-    #elif defined(__GNUC__) && __GNUC__ >= 3
+    #elif wxCHECK_GCC_VERSION(3,0)

         #define HAVE_VARIADIC_MACROS
     #elif wxCHECK_VISUALC_VERSION(8)
         #define HAVE_VARIADIC_MACROS
         #define HAVE_VARIADIC_MACROS
     #elif wxCHECK_VISUALC_VERSION(8)
         #define HAVE_VARIADIC_MACROS