diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-08-08 22:36:32 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-08-08 22:36:32 +0000 |
| commit | bcc929a5b6760660d307c30da58efdd24c9411fb (patch) | |
| tree | 2394156d6c1a1f8f120c7d7f7cdd4bc6f98f0c7a /gtk2_ardour/marker.cc | |
| parent | 9c6449567d2dc6ce65b99fc1f9e94fc11cccc743 (diff) | |
waf build works on OS X ; new bindings file and processing system in place for mnemonic-us
git-svn-id: svn://localhost/ardour2/branches/3.0@5498 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker.cc')
| -rw-r--r-- | gtk2_ardour/marker.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 392ba85152..131354e72e 100644 --- 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> |