diff --git a/dtool/src/dtoolutil/dSearchPath.cxx b/dtool/src/dtoolutil/dSearchPath.cxx index b5278d1261..3401fe1611 100644 --- a/dtool/src/dtoolutil/dSearchPath.cxx +++ b/dtool/src/dtoolutil/dSearchPath.cxx @@ -21,6 +21,8 @@ #include +const string standard_delimiters = ": \n\t"; + //////////////////////////////////////////////////////////////////// // Function: DSearchPath::Results::Constructor // Access: Public diff --git a/dtool/src/dtoolutil/dSearchPath.h b/dtool/src/dtoolutil/dSearchPath.h index 97e904a7b1..8c86b73aca 100644 --- a/dtool/src/dtoolutil/dSearchPath.h +++ b/dtool/src/dtoolutil/dSearchPath.h @@ -25,6 +25,8 @@ #include +extern EXPCL_DTOOL const string standard_delimiters; + /////////////////////////////////////////////////////////////////// // Class : DSearchPath // Description : This class stores a list of directories that can be @@ -55,7 +57,7 @@ public: PUBLISHED: DSearchPath(); - DSearchPath(const string &path, const string &delimiters = ": \t\n"); + DSearchPath(const string &path, const string &delimiters = standard_delimiters); DSearchPath(const DSearchPath ©); void operator = (const DSearchPath ©); ~DSearchPath(); @@ -64,7 +66,7 @@ PUBLISHED: void append_directory(const Filename &directory); void prepend_directory(const Filename &directory); void append_path(const string &path, - const string &delimiters = ": \t\n"); + const string &delimiters = standard_delimiters); void append_path(const DSearchPath &path); void prepend_path(const DSearchPath &path); @@ -77,7 +79,7 @@ PUBLISHED: INLINE static Filename search_path(const Filename &filename, const string &path, - const string &delimiters = ": \t\n"); + const string &delimiters = standard_delimiters); void output(ostream &out, const string &separator = ":") const; void write(ostream &out, int indent_level = 0) const;