Fix collision between keyword interface used in glibmm and windows headers

2014-05-02 16:45:26 +10:00 · 2014-05-02 16:45:26 +10:00 · ce5744ae51
commit ce5744ae51
parent 592a21db5f
2 changed files with 4 additions and 4 deletions
--- a/gtk2_ardour/add_video_dialog.h
+++ b/gtk2_ardour/add_video_dialog.h
@ -22,6 +22,10 @@

 #include <string>

+#ifdef interface
+#undef interface
+#endif
+
 #include <gtkmm.h>

 #include "ardour/types.h"
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@ -28,10 +28,6 @@
 #include "ardour/profile.h"
 #include "ardour/session.h"

-#ifdef interface
-#undef interface
-#endif
-
 #include "actions.h"
 #include "add_route_dialog.h"
 #include "add_video_dialog.h"