From 533e40ca52c9a8f969405d4afbb82552956445ae Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sun, 21 Jul 2013 18:49:29 +1000 Subject: [PATCH] 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 --- gtk2_ardour/export_video_infobox.cc | 3 +++ gtk2_ardour/video_server_dialog.cc | 4 ++++ libs/gtkmm2ext/gtkmm2ext/gtk_ui.h | 4 ++++ 3 files changed, 11 insertions(+) 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 #include +#ifdef interface +#undef interface +#endif + #include #include -- 2.30.2