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

Reconcile HAVE_VARIADIC_MACROS and wxHAS_VARIADIC_MACROS definitions.

Browse Source 
The main user-visible effect of this change is that giving configure
--disable-vararg-macros argument now really disables the use of variadic
macros whereas it didn't disable them in wx/cpp.h before.

It is, of course, also less confusing to not have two very similar but
different symbols.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-07-11 22:40:47 +00:00
parent 46965705ca
commit 168d1f65c1
7 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/wx/cpp.h
View File

@@ -124,16 +124,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 defined(__GNUC__) && __GNUC__ >= 3
#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 +180,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_ */