From 11837cf46f31cc714e336e2849444e31c4b45373 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 29 May 2008 20:20:11 +0000 Subject: [PATCH] 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 --- libs/sigc++2/sigc++/functors/functor_trait.h | 4 ++++ 1 file changed, 4 insertions(+) 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 +#ifdef nil +/* stupid OS X, defining nil */ +#undef nil +#endif namespace sigc {