Merge branch 'master' into windows

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

diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index 4c7e996e462830efab0289a1ee69a08316817b65..54f7508b659d92ce55b34410dcbbd1fb35b26f1b 100644 (file)
--- a/libs/ardour/filesystem_paths.cc
+++ b/libs/ardour/filesystem_paths.cc
@@ -86,7 +86,7 @@ user_config_directory ()
 std::string
 ardour_dll_directory ()
 {
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
        std::string dll_dir_path(g_win32_get_package_installation_directory_of_module(NULL));
        dll_dir_path = Glib::build_filename (dll_dir_path, "lib");
        return Glib::build_filename (dll_dir_path, "ardour3");
@@ -100,8 +100,8 @@ ardour_dll_directory ()
 #endif
 }
 
-#ifdef WIN32
-SearchPath
+#ifdef PLATFORM_WINDOWS
+Searchpath
 windows_search_path ()
 {
        std::string dll_dir_path(g_win32_get_package_installation_directory_of_module(NULL));
@@ -110,14 +110,14 @@ windows_search_path ()
 }
 #endif
 
-SearchPath
+Searchpath
 ardour_config_search_path ()
 {
-       static SearchPath search_path;
+       static Searchpath search_path;
 
        if (search_path.empty()) {
                search_path += user_config_directory();
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
                search_path += windows_search_path ();
 #else
                std::string s = Glib::getenv("ARDOUR_CONFIG_PATH");
@@ -126,21 +126,21 @@ ardour_config_search_path ()
                        ::exit (1);
                }
                
-               search_path += SearchPath (s);
+               search_path += Searchpath (s);
 #endif
        }
 
        return search_path;
 }
 
-SearchPath
+Searchpath
 ardour_data_search_path ()
 {
-       static SearchPath search_path;
+       static Searchpath search_path;
 
        if (search_path.empty()) {
                search_path += user_config_directory();
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
                search_path += windows_search_path ();
 #else
                std::string s = Glib::getenv("ARDOUR_DATA_PATH");
@@ -149,7 +149,7 @@ ardour_data_search_path ()
                        ::exit (1);
                }
                
-               search_path += SearchPath (s);
+               search_path += Searchpath (s);
 #endif
        }