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 9fed106a76b2cb06174367aa518bbf53fddad057..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
- *  RCS-ID:      $Id$
  *  Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
  *  Licence:     wxWindows licence
  */
@@ -13,6 +12,8 @@
 #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
 
@@ -124,16 +125,24 @@
 #endif /* __WXFUNCTION__ already defined */
 
 
-#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
-    (defined(__cplusplus) && __cplusplus >= 201103L)
-    #define wxHAS_VARIADIC_MACROS
-#elif defined(__GNUC__) && __GNUC__ >= 3
-    #define wxHAS_VARIADIC_MACROS
-#elif defined(_MSC_VER) && _MSC_VER >= 1400
-    #define wxHAS_VARIADIC_MACROS
-#endif
+/* Auto-detect variadic macros support unless explicitly disabled. */
+#if !defined(HAVE_VARIADIC_MACROS) && !defined(wxNO_VARIADIC_MACROS)
+    /* Any C99 or C++11 compiler should have them. */
+    #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
+        (defined(__cplusplus) && __cplusplus >= 201103L)
+        #define HAVE_VARIADIC_MACROS
+    #elif wxCHECK_GCC_VERSION(3,0)
+        #define HAVE_VARIADIC_MACROS
+    #elif wxCHECK_VISUALC_VERSION(8)
+        #define HAVE_VARIADIC_MACROS
+    #elif wxCHECK_WATCOM_VERSION(1,2)
+        #define HAVE_VARIADIC_MACROS
+    #endif
+#endif /* !HAVE_VARIADIC_MACROS */
+
+
 
-#ifdef wxHAS_VARIADIC_MACROS
+#ifdef HAVE_VARIADIC_MACROS
 /*
    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
@@ -172,7 +181,7 @@
 
 #else
     #define wxCALL_FOR_EACH  Error_wx_CALL_FOR_EACH_requires_variadic_macros_support
-#endif /* wxHAS_VARIADIC_MACROS */
+#endif /* HAVE_VARIADIC_MACROS */
 
 #endif /* _WX_CPP_H_ */