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

diff --git a/libs/sigc++2/sigc++/functors/functor_trait.h b/libs/sigc++2/sigc++/functors/functor_trait.h
index 656d010414358619fdcadabb29709b7c0201f490..5a9ff8f42ef1b0ef906c38d711f47bc8c21d1ae1 100644 (file)
--- 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 {