diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2013-07-21 18:49:29 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2013-07-22 13:44:32 +1000 |
| commit | 533e40ca52c9a8f969405d4afbb82552956445ae (patch) | |
| tree | 9dc76e73de6f8e2f0fca61fb9fcf931c6a1ae662 | |
| parent | f383585094528b62585d9a534a1ea6eff62ed42f (diff) | |
Work around badly chosen argument name in giomm/dbusmessage.h
interface is defined in windows/mingw headers. hopefully this will
be fixed in giomm at some point and this crap can be removed
| -rw-r--r-- | gtk2_ardour/export_video_infobox.cc | 3 | ||||
| -rw-r--r-- | gtk2_ardour/video_server_dialog.cc | 4 | ||||
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/gtk_ui.h | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/gtk2_ardour/export_video_infobox.cc b/gtk2_ardour/export_video_infobox.cc index fbe28bd821..a3e356decc 100644 --- a/gtk2_ardour/export_video_infobox.cc +++ b/gtk2_ardour/export_video_infobox.cc @@ -18,6 +18,9 @@ */ #include "ardour/session.h" +#ifdef interface +#undef interface +#endif #include "export_video_infobox.h" #include "i18n.h" diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc index 8838409ccf..a8383f4d23 100644 --- a/gtk2_ardour/video_server_dialog.cc +++ b/gtk2_ardour/video_server_dialog.cc @@ -29,6 +29,10 @@ #include "ardour/template_utils.h" #include "ardour/session.h" +#ifdef interface +#undef interface +#endif + #include "video_server_dialog.h" #include "utils_videotl.h" #include "i18n.h" diff --git a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h index 64176232f0..a758ad78f4 100644 --- a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h +++ b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h @@ -27,6 +27,10 @@ #include <setjmp.h> #include <pthread.h> +#ifdef interface +#undef interface +#endif + #include <glibmm/thread.h> #include <gtkmm/widget.h> |