smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

Fix collision between keyword interface used in glibmm and windows headers

Browse source
This commit is contained in:
Tim Mayberry 2014-05-02 16:45:26 +10:00
parent 592a21db5f
commit ce5744ae51
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/add_video_dialog.h
View file

@ -22,6 +22,10 @@
#include <string> #include <string>
#ifdef interface
#undef interface
#endif
#include <gtkmm.h> #include <gtkmm.h>
#include "ardour/types.h" #include "ardour/types.h"

4
gtk2_ardour/ardour_ui_dialogs.cc
View file

@ -28,10 +28,6 @@
#include "ardour/profile.h" #include "ardour/profile.h"
#include "ardour/session.h" #include "ardour/session.h"
#ifdef interface
#undef interface
#endif
#include "actions.h" #include "actions.h"
#include "add_route_dialog.h" #include "add_route_dialog.h"
#include "add_video_dialog.h" #include "add_video_dialog.h"