waf build works on OS X ; new bindings file and processing system in place for mnemon...

[ardour.git] / gtk2_ardour / marker.cc

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 392ba851526355ef604c3705f093a516787b003a..131354e72e0f4024ff173c456cc202dceadf5665 100644 (file)
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -20,11 +20,17 @@
 #include <sigc++/bind.h>
 #include "ardour/tempo.h"
 
+#include "ardour_ui.h"
+/*
+ * ardour_ui.h include was moved to the top of the list
+ * due to a conflicting definition of 'Rect' between
+ * Apple's MacTypes.h and GTK.
+ */
+
 #include "marker.h"
 #include "public_editor.h"
 #include "utils.h"
 #include "canvas_impl.h"
-#include "ardour_ui.h"
 #include "simpleline.h"
 
 #include <gtkmm2ext/utils.h>