diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2013-08-15 20:04:08 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2013-09-06 14:31:11 +1000 |
| commit | 8ddd12a60d08d895cb5400013cdda2e893fb81bb (patch) | |
| tree | 84c0082083295835e33c38c12acc5e21cb9b7c7e /libs/ardour/ardour/filesystem_paths.h | |
| parent | e6c7ecf0e369ba886a7dc57a195226921f0f11f1 (diff) | |
Rename SearchPath class Searchpath
Windows headers define SearchPath which means we have to undefine it
where necessary. This is a pain and can be tricksy, so I feel renaming
the class slightly is the easiest solution.
Diffstat (limited to 'libs/ardour/ardour/filesystem_paths.h')
| -rw-r--r-- | libs/ardour/ardour/filesystem_paths.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libs/ardour/ardour/filesystem_paths.h b/libs/ardour/ardour/filesystem_paths.h index 7c817e86a1..e77de1c00f 100644 --- a/libs/ardour/ardour/filesystem_paths.h +++ b/libs/ardour/ardour/filesystem_paths.h @@ -22,10 +22,6 @@ #include "pbd/search_path.h" -#ifdef SearchPath -#undef SearchPath -#endif - namespace ARDOUR { /** @@ -45,14 +41,14 @@ namespace ARDOUR { * @return the search path to be used when looking for per-system * configuration files. This may include user configuration files. */ - PBD::SearchPath ardour_config_search_path (); + PBD::Searchpath ardour_config_search_path (); /** * @return the search path to be used when looking for data files * that could be shared by systems (h/w and configuration independent * files, such as icons, XML files, etc) */ - PBD::SearchPath ardour_data_search_path (); + PBD::Searchpath ardour_data_search_path (); } // namespace ARDOUR |