summaryrefslogtreecommitdiff
path: root/libs/pbd/pbd/signals.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-04-12 21:46:44 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-04-12 21:46:44 -0400
commit4e84bc3a39ca624d62be590c532a8bc33b33baa4 (patch)
treee81eda4a9f866590e1a4bb5891fba057c9b86ccc /libs/pbd/pbd/signals.h
parentb05968fb4e303ce47b6e09cd1bc713f3af28a6f9 (diff)
changes to get cairocanvas branch to build on OS X, with its stupid nil and Rect macros, plus some const_cast<> and unused variable fixes that should really be in master but will have to wait till we rebase master
Diffstat (limited to 'libs/pbd/pbd/signals.h')
-rw-r--r--libs/pbd/pbd/signals.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/pbd/pbd/signals.h b/libs/pbd/pbd/signals.h
index 69c52f57cf..140ea014e8 100644
--- a/libs/pbd/pbd/signals.h
+++ b/libs/pbd/pbd/signals.h
@@ -22,6 +22,11 @@
#include <list>
#include <map>
+
+#ifdef nil
+#undef nil
+#endif
+
#include <glibmm/threads.h>
#include <boost/noncopyable.hpp>