From 29483c2e15641fb57279b78e6afe2e45d79a4658 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 3 Jan 2014 01:12:58 +0000 Subject: [PATCH] Define HAVE_VARIADIC_MACROS as 1, not nothing, in wx/cpp.h. This avoids g++ warning about HAVE_VARIADIC_MACROS redefinition in setup.h if wx/cpp.h happens to be included before it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cpp.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/cpp.h b/include/wx/cpp.h index b5ce014e4d..dd40696d83 100644 --- a/include/wx/cpp.h +++ b/include/wx/cpp.h @@ -130,13 +130,13 @@ /* Any C99 or C++11 compiler should have them. */ #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \ (defined(__cplusplus) && __cplusplus >= 201103L) - #define HAVE_VARIADIC_MACROS + #define HAVE_VARIADIC_MACROS 1 #elif wxCHECK_GCC_VERSION(3,0) - #define HAVE_VARIADIC_MACROS + #define HAVE_VARIADIC_MACROS 1 #elif wxCHECK_VISUALC_VERSION(8) - #define HAVE_VARIADIC_MACROS + #define HAVE_VARIADIC_MACROS 1 #elif wxCHECK_WATCOM_VERSION(1,2) - #define HAVE_VARIADIC_MACROS + #define HAVE_VARIADIC_MACROS 1 #endif #endif /* !HAVE_VARIADIC_MACROS */