Undef SearchPath where needed as it is defined via windows.h

This is pretty annoying, might even be worth renaming the class

diff --git a/libs/ardour/ardour/export_profile_manager.h b/libs/ardour/ardour/export_profile_manager.h
index 424e0fe163c7b0f552b5bd3aee520f5ecbfa6f12..114fb09647050b9b6f3353b6a4b805034133009b 100644 (file)
--- a/libs/ardour/ardour/export_profile_manager.h
+++ b/libs/ardour/ardour/export_profile_manager.h
@@ -38,6 +38,10 @@
 #include "ardour/types.h"
 #include "ardour/export_handler.h"
 
+#ifdef SearchPath
+#undef SearchPath
+#endif
+
 namespace ARDOUR
 {
 

diff --git a/libs/ardour/ardour/filesystem_paths.h b/libs/ardour/ardour/filesystem_paths.h
index cfeb633597cb2fac5c34c22d704e9d791cb3728c..7c817e86a1255adab48e8aecbec32d135c53acdd 100644 (file)
--- a/libs/ardour/ardour/filesystem_paths.h
+++ b/libs/ardour/ardour/filesystem_paths.h
@@ -22,6 +22,10 @@
 
 #include "pbd/search_path.h"
 
+#ifdef SearchPath
+#undef SearchPath
+#endif
+
 namespace ARDOUR {
 
        /**

diff --git a/libs/ardour/panner_manager.cc b/libs/ardour/panner_manager.cc
index e77104dd33eff6f32eeb0561b7e827ff455c3c28..06fc42aab92eee6a8d91110b77ac2b2d5a00092e 100644 (file)
--- a/libs/ardour/panner_manager.cc
+++ b/libs/ardour/panner_manager.cc
@@ -28,6 +28,11 @@
 
 #include "ardour/debug.h"
 #include "ardour/panner_manager.h"
+
+#ifdef SearchPath
+#undef SearchPath
+#endif
+
 #include "ardour/panner_search_path.h"
 
 #include "i18n.h"

diff --git a/libs/ardour/template_utils.cc b/libs/ardour/template_utils.cc
index 05007b0ade901f391425f4974079d7f1212e7e05..c57f2400ac561c8205d27e74a2191092264d39dd 100644 (file)
--- a/libs/ardour/template_utils.cc
+++ b/libs/ardour/template_utils.cc
@@ -32,6 +32,10 @@
 #include "ardour/filename_extensions.h"
 #include "ardour/io.h"
 
+#ifdef SearchPath
+#undef SearchPath
+#endif
+
 using namespace std;
 using namespace PBD;
 

diff --git a/libs/pbd/pbd/search_path.h b/libs/pbd/pbd/search_path.h
index 5358d6e14c6a409313eb35990dc5feeaf7991b2a..cc53dbebac606a4e06c3e5b2eedc5ffd498b3a9c 100644 (file)
--- a/libs/pbd/pbd/search_path.h
+++ b/libs/pbd/pbd/search_path.h
@@ -20,6 +20,10 @@
 #ifndef PBD_SEARCH_PATH_INCLUDED
 #define PBD_SEARCH_PATH_INCLUDED
 
+#ifdef SearchPath
+#undef SearchPath
+#endif
+
 #include <string>
 #include <vector>