From ce5744ae518f20cf61270ec44e7c0f1e2957a035 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Fri, 2 May 2014 16:45:26 +1000 Subject: [PATCH] Fix collision between keyword interface used in glibmm and windows headers --- gtk2_ardour/add_video_dialog.h | 4 ++++ gtk2_ardour/ardour_ui_dialogs.cc | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/add_video_dialog.h b/gtk2_ardour/add_video_dialog.h index 203df3ad3d..3d5ff54030 100644 --- a/gtk2_ardour/add_video_dialog.h +++ b/gtk2_ardour/add_video_dialog.h @@ -22,6 +22,10 @@ #include +#ifdef interface +#undef interface +#endif + #include #include "ardour/types.h" diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 35dbe3cfc9..6fef5b94e4 100644 --- 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"