diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-05-29 20:20:11 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-05-29 20:20:11 +0000 |
| commit | 11837cf46f31cc714e336e2849444e31c4b45373 (patch) | |
| tree | fc1af254de9afc11900a7c02a47e54bba46155a0 /libs/sigc++2 | |
| parent | 02ddd35fc9f11f11b9c0f932701eb0cadd4fe040 (diff) | |
fix for sigc++ compilation on platforms where "nil" is a C macro
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3427 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/sigc++2')
| -rw-r--r-- | libs/sigc++2/sigc++/functors/functor_trait.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/sigc++2/sigc++/functors/functor_trait.h b/libs/sigc++2/sigc++/functors/functor_trait.h index 656d010414..5a9ff8f42e 100644 --- a/libs/sigc++2/sigc++/functors/functor_trait.h +++ b/libs/sigc++2/sigc++/functors/functor_trait.h @@ -24,6 +24,10 @@ #define _SIGC_FUNCTORS_MACROS_FUNCTOR_TRAITHM4_ #include <sigc++/type_traits.h> +#ifdef nil +/* stupid OS X, defining nil */ +#undef nil +#endif namespace sigc { |