diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-11 14:27:24 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-11 14:27:24 -0400 |
| commit | b6afce39a40f5a6f06de665c242d96934b7e3f8e (patch) | |
| tree | 12e6ad1540cdb9be6e7e52a24f9f988cf18c1395 /libs | |
| parent | 4d71933f5ba09af4dfb79459798611994ca60b8f (diff) | |
Undef SearchPath where needed as it is defined via windows.h
This is pretty annoying, might even be worth renaming the class
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/export_profile_manager.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/filesystem_paths.h | 4 | ||||
| -rw-r--r-- | libs/ardour/panner_manager.cc | 5 | ||||
| -rw-r--r-- | libs/ardour/template_utils.cc | 4 | ||||
| -rw-r--r-- | libs/pbd/pbd/search_path.h | 4 |
5 files changed, 21 insertions, 0 deletions
diff --git a/libs/ardour/ardour/export_profile_manager.h b/libs/ardour/ardour/export_profile_manager.h index 424e0fe163..114fb09647 100644 --- 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 cfeb633597..7c817e86a1 100644 --- 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 e77104dd33..06fc42aab9 100644 --- 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 05007b0ade..c57f2400ac 100644 --- 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 5358d6e14c..cc53dbebac 100644 --- 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> |