From f3858b193210973b9b74b5c7bdbc3e89aef48f93 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 11 Jul 2013 22:34:16 -0400 Subject: [PATCH] undef SearchPath where needed as it is defined via windows.h --- gtk2_ardour/about.cc | 4 ++++ gtk2_ardour/keyboard.cc | 4 ++++ gtk2_ardour/mixer_actor.cc | 4 ++++ gtk2_ardour/step_entry.cc | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc index 6255bfa108..b2dac67379 100644 --- a/gtk2_ardour/about.cc +++ b/gtk2_ardour/about.cc @@ -40,6 +40,10 @@ #include "i18n.h" +#ifdef SearchPath +#undef SearchPath +#endif + using namespace Gtk; using namespace Gdk; using namespace std; diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index 98ffab1160..75a96ec98b 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -28,6 +28,10 @@ #include "i18n.h" +#ifdef SearchPath +#undef SearchPath +#endif + using namespace std; using namespace Gtk; using namespace PBD; diff --git a/gtk2_ardour/mixer_actor.cc b/gtk2_ardour/mixer_actor.cc index d7a1149a4b..8a90a3a1dd 100644 --- a/gtk2_ardour/mixer_actor.cc +++ b/gtk2_ardour/mixer_actor.cc @@ -35,6 +35,10 @@ #include "i18n.h" +#ifdef SearchPath +#undef SearchPath +#endif + using namespace ARDOUR; using namespace Gtk; using namespace PBD; diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc index fd53fd55ff..27ec3b4059 100644 --- a/gtk2_ardour/step_entry.cc +++ b/gtk2_ardour/step_entry.cc @@ -36,6 +36,10 @@ #include "i18n.h" +#ifdef SearchPath +#undef SearchPath +#endif + using namespace std; using namespace Gtk; using namespace Glib;