From c985a64d5851634a77bc013a7f66ef8d9ccefcae Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 12 Sep 2013 11:40:56 -0400 Subject: merge with master and fix Searchpath conflict --- libs/backends/jack/jack_utils.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs') diff --git a/libs/backends/jack/jack_utils.cc b/libs/backends/jack/jack_utils.cc index 93fc3d440a..a78c6491c7 100644 --- a/libs/backends/jack/jack_utils.cc +++ b/libs/backends/jack/jack_utils.cc @@ -554,7 +554,7 @@ ARDOUR::set_path_env_for_jack_autostart (const vector& dirs) #ifdef __APPLE__ // push it back into the environment so that auto-started JACK can find it. // XXX why can't we just expect OS X users to have PATH set correctly? we can't ... - setenv ("PATH", SearchPath(dirs).to_string().c_str(), 1); + setenv ("PATH", Searchpath(dirs).to_string().c_str(), 1); #else /* silence a compiler unused variable warning */ (void) dirs; @@ -577,7 +577,7 @@ ARDOUR::get_jack_server_dir_paths (vector& server_dir_paths) server_dir_paths.push_back (Glib::path_get_dirname (execpath)); #endif - SearchPath sp(string(g_getenv("PATH"))); + Searchpath sp(string(g_getenv("PATH"))); #ifdef WIN32 gchar *install_dir = g_win32_get_package_installation_directory_of_module (NULL); -- cgit v1.2.3