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
This commit is contained in:
Paul Davis 2013-07-11 15:29:28 -04:00
parent 01ed4f3388
commit 5cafb98983
9 changed files with 34 additions and 1 deletions

View file

@ -28,7 +28,7 @@
#include <fstream>
#ifndef WIN32
#include <sys/resource.h>#
#include <sys/resource.h>
#endif
#include <stdint.h>

View file

@ -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>

View file

@ -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>

View file

@ -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 {

View file

@ -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"

View file

@ -22,6 +22,10 @@
#include <string>
#include <vector>
#ifdef interface
#undef interface
#endif
#include <libgnomecanvasmm.h>
#include <libgnomecanvasmm/polygon.h>

View file

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

View file

@ -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>

View file

@ -22,6 +22,10 @@
#include "ardour_dialog.h"
#ifdef interface
#undef interface
#endif
#include <gtkmm.h>
#include <boost/shared_ptr.hpp>