diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/audio_region_view.h | 4 | ||||
| -rw-r--r-- | gtk2_ardour/export_channel_selector.h | 4 | ||||
| -rw-r--r-- | gtk2_ardour/export_format_dialog.h | 4 | ||||
| -rw-r--r-- | gtk2_ardour/export_timespan_selector.h | 5 | ||||
| -rw-r--r-- | gtk2_ardour/midi_region_view.h | 4 | ||||
| -rw-r--r-- | gtk2_ardour/region_gain_line.h | 4 | ||||
| -rw-r--r-- | gtk2_ardour/region_view.h | 4 | ||||
| -rw-r--r-- | gtk2_ardour/session_metadata_dialog.h | 4 |
9 files changed, 34 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index db3dc5cb7c..5bef863c95 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -28,7 +28,7 @@ #include <fstream> #ifndef WIN32 -#include <sys/resource.h># +#include <sys/resource.h> #endif #include <stdint.h> diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h index 10159d0cfb..7c6d6b88f2 100644 --- a/gtk2_ardour/audio_region_view.h +++ b/gtk2_ardour/audio_region_view.h @@ -19,6 +19,10 @@ #ifndef __gtk_ardour_audio_region_view_h__ #define __gtk_ardour_audio_region_view_h__ +#ifdef interface +#undef interface +#endif + #include <vector> #include <libgnomecanvasmm.h> diff --git a/gtk2_ardour/export_channel_selector.h b/gtk2_ardour/export_channel_selector.h index 984026a748..bc165273c7 100644 --- a/gtk2_ardour/export_channel_selector.h +++ b/gtk2_ardour/export_channel_selector.h @@ -25,6 +25,10 @@ #include "ardour/export_profile_manager.h" +#ifdef interface +#undef interface +#endif + #include <gtkmm.h> #include <sigc++/signal.h> #include <boost/shared_ptr.hpp> diff --git a/gtk2_ardour/export_format_dialog.h b/gtk2_ardour/export_format_dialog.h index 8d37ded2cd..3e38cf09d6 100644 --- a/gtk2_ardour/export_format_dialog.h +++ b/gtk2_ardour/export_format_dialog.h @@ -32,6 +32,10 @@ #include "ardour_dialog.h" #include "audio_clock.h" +#ifdef interface +#undef interface +#endif + #include <gtkmm.h> class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList { diff --git a/gtk2_ardour/export_timespan_selector.h b/gtk2_ardour/export_timespan_selector.h index 2118a57b83..5556f5f676 100644 --- a/gtk2_ardour/export_timespan_selector.h +++ b/gtk2_ardour/export_timespan_selector.h @@ -25,9 +25,14 @@ #include <list> +#ifdef interface +#undef interface +#endif + #include <gtkmm.h> #include <boost/shared_ptr.hpp> + #include "ardour/types.h" #include "ardour/session_handle.h" #include "ardour/export_profile_manager.h" diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h index 5f374da55c..219d07f376 100644 --- a/gtk2_ardour/midi_region_view.h +++ b/gtk2_ardour/midi_region_view.h @@ -22,6 +22,10 @@ #include <string> #include <vector> +#ifdef interface +#undef interface +#endif + #include <libgnomecanvasmm.h> #include <libgnomecanvasmm/polygon.h> diff --git a/gtk2_ardour/region_gain_line.h b/gtk2_ardour/region_gain_line.h index c0b843acd0..61b361210b 100644 --- a/gtk2_ardour/region_gain_line.h +++ b/gtk2_ardour/region_gain_line.h @@ -22,6 +22,10 @@ #include "ardour/ardour.h" +#ifdef interface +#undef interface +#endif + #include <libgnomecanvasmm.h> #include "automation_line.h" diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h index 1eda8fd360..3016117353 100644 --- a/gtk2_ardour/region_view.h +++ b/gtk2_ardour/region_view.h @@ -19,6 +19,10 @@ #ifndef __gtk_ardour_region_view_h__ #define __gtk_ardour_region_view_h__ +#ifdef interface +#undef interface +#endif + #include <vector> #include <libgnomecanvasmm.h> diff --git a/gtk2_ardour/session_metadata_dialog.h b/gtk2_ardour/session_metadata_dialog.h index bd1e042bb7..1599e50bb3 100644 --- a/gtk2_ardour/session_metadata_dialog.h +++ b/gtk2_ardour/session_metadata_dialog.h @@ -22,6 +22,10 @@ #include "ardour_dialog.h" +#ifdef interface +#undef interface +#endif + #include <gtkmm.h> #include <boost/shared_ptr.hpp> |