merge and resolve conflict with master

[ardour.git] / libs / ardour / plugin_manager.cc

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 8d4e6258767617cc3b427bf74fb042c3f2bad457..8d209cc78e29c936519a1b874036e13249ec7600 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -59,10 +59,6 @@
 #include "ardour/plugin_manager.h"
 #include "ardour/rc_configuration.h"
 
-#ifdef SearchPath
-#undef SearchPath
-#endif
-
 #include "ardour/ladspa_search_path.h"
 
 #ifdef LV2_SUPPORT