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
2013-07-21 18:49:29 +10:00 · 2013-07-21 18:49:29 +10:00 · 533e40ca52
commit 533e40ca52
parent f383585094
3 changed files with 11 additions and 0 deletions
--- 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"

--- 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"
--- 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>