diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-01 15:33:23 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-01 15:33:23 +0000 |
| commit | a0d4c9b392d021218f5a0e1b79d0011f7191134c (patch) | |
| tree | 0ef3e66e19869e5f25507db488e93903c03726f2 /gtk2_ardour/editor_canvas.cc | |
| parent | 49a9fa20a56c6f5607e7bcf209985a67972c3f31 (diff) | |
merge 5674:5682 and 5689-5694 from mixbus branch
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5695 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_canvas.cc')
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index b83f39fbc8..13ff108135 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -17,6 +17,12 @@ */ +#ifdef __APPLE__ +#define Rect AppleHasItsOwnRect +#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h> +#undef Rect +#endif /* __APPLE__ */ + #include <libgnomecanvasmm/init.h> #include <libgnomecanvasmm/pixbuf.h> #include <jack/types.h> |