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

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index db3dc5cb7c50b2ccef59496475c2bf4607c15381..5bef863c955e964a736535c3bc62529626c88207 100644 (file)
--- 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 10159d0cfbf6970716051d7952ebf3ae803d033f..7c6d6b88f24311bbfe53a08b68ac691a7a939dc2 100644 (file)
--- 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 984026a74873b4b14df556e11734ddec42b30f8f..bc165273c73f1b66e81d32a6303253bae6348e68 100644 (file)
--- 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 8d37ded2cdd5201c690cf73c82c8e277de398036..3e38cf09d662a55b3e67c8dbfb9706f7d4e3d9df 100644 (file)
--- 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 2118a57b836f23353203524b41acdc4f25f7374e..5556f5f676eb4dae77abfa03a16b0e628b592d69 100644 (file)
--- 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 5f374da55cc85620e99b808369c15ca57fe6dd4c..219d07f37615cf482900cbfb4294b2ba1fa734c7 100644 (file)
--- 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 c0b843acd076b103b6692052d2e7240a6d9728b2..61b361210bb8964b4b0a3787f50cc92ca28f7cd1 100644 (file)
--- 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 1eda8fd3606c5f4d80193d4686326e4bc2035b1b..30161173530d929df45da51d2516e79adddd08d7 100644 (file)
--- 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 bd1e042bb74004444ede61dc383003c053fa9214..1599e50bb3e9c5d804f8fac5eae821bab80d09f1 100644 (file)
--- 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>