diff options
| author | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2015-12-16 09:39:07 +0100 |
|---|---|---|
| committer | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2015-12-16 09:39:07 +0100 |
| commit | 75466ce1e1d92fe04926f72567417912779cc5c1 (patch) | |
| tree | a1065baeac49d54dcb6916b2a144fd382ca87aac /configure.ac | |
| parent | 9bd7f99838f1fb0f67fe5a66155dc13d075041df (diff) | |
| download | sigc++-75466ce1e1d92fe04926f72567417912779cc5c1.tar.gz | |
Temporarily undefine the nil macro, if it's defined
* build/cxx.m4: Add SIGC_CXX_PRAGMA_PUSH_POP_MACRO.
* configure.ac: Call SIGC_CXX_PRAGMA_PUSH_POP_MACRO.
* sigc++config.h.in: Add SIGC_PRAGMA_PUSH_POP_MACRO.
* sigc++/functors/macros/functor_trait.h.m4:
* sigc++/adaptors/macros/bind.h.m4:
* sigc++/adaptors/macros/retype.h.m4:
* sigc++/functors/macros/slot.h.m4:
* sigc++/macros/signal.h.m4: If nil and SIGC_PRAGMA_PUSH_POP_MACRO are
defined, undefine nil temporarily in the header files.
nil is a keyword in Objective-C++ and in Mac OS X C++. Bug #695235.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 67f2191..6e497a4 100644 --- a/configure.ac +++ b/configure.ac @@ -53,6 +53,7 @@ AC_LANG([C++]) SIGC_CXX_GCC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD SIGC_CXX_MSVC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD SIGC_CXX_SELF_REFERENCE_IN_MEMBER_INITIALIZATION +SIGC_CXX_PRAGMA_PUSH_POP_MACRO SIGC_CXX_HAS_NAMESPACE_STD SIGC_CXX_HAS_SUN_REVERSE_ITERATOR |