Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define HAVE_VARIADIC_MACROS as 1, not nothing, in wx/cpp.h.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2014-01-03 01:12:58 +00:00
parent c407f6e2bd
commit 29483c2e15
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/cpp.h
View File

@@ -130,13 +130,13 @@
/* Any C99 or C++11 compiler should have them. */ /* Any C99 or C++11 compiler should have them. */
#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \ #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
(defined(__cplusplus) && __cplusplus >= 201103L) (defined(__cplusplus) && __cplusplus >= 201103L)
#define HAVE_VARIADIC_MACROS #define HAVE_VARIADIC_MACROS 1
#elif wxCHECK_GCC_VERSION(3,0) #elif wxCHECK_GCC_VERSION(3,0)
#define HAVE_VARIADIC_MACROS #define HAVE_VARIADIC_MACROS 1
#elif wxCHECK_VISUALC_VERSION(8) #elif wxCHECK_VISUALC_VERSION(8)
#define HAVE_VARIADIC_MACROS #define HAVE_VARIADIC_MACROS 1
#elif wxCHECK_WATCOM_VERSION(1,2) #elif wxCHECK_WATCOM_VERSION(1,2)
#define HAVE_VARIADIC_MACROS #define HAVE_VARIADIC_MACROS 1
#endif #endif
#endif /* !HAVE_VARIADIC_MACROS */ #endif /* !HAVE_VARIADIC_MACROS */