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 /gtk2_ardour/about.cc | |
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 'gtk2_ardour/about.cc')
-rw-r--r-- | gtk2_ardour/about.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc index b2dac67379..b656c29ad8 100644 --- a/gtk2_ardour/about.cc +++ b/gtk2_ardour/about.cc @@ -40,10 +40,6 @@ #include "i18n.h" -#ifdef SearchPath -#undef SearchPath -#endif - using namespace Gtk; using namespace Gdk; using namespace std; @@ -564,7 +560,7 @@ About::About () std::string splash_file; - SearchPath spath(ardour_data_search_path()); + Searchpath spath(ardour_data_search_path()); if (find_file_in_search_path (spath, "splash.png", splash_file)) { set_logo (Gdk::Pixbuf::create_from_file (splash_file)); |