From a1c91f4695e208d5a8f80dc37b1818169b7829ff Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:24:59 +0200 Subject: 5.17 --- lib/resolve_path.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/resolve_path.h') diff --git a/lib/resolve_path.h b/lib/resolve_path.h index 4e85c8ee..b9c7196f 100644 --- a/lib/resolve_path.h +++ b/lib/resolve_path.h @@ -19,14 +19,14 @@ FULL directory format: - convert relative paths into absolute - trim whitespace and append file name separator */ -Zstring getFormattedDirectoryName(const Zstring& dirString); //throw() - non-blocking! no I/O! not thread-safe!!!(see ::GetFullPathName()) +Zstring getFormattedDirectoryName(const Zstring& dirString); //throw() - may still block for slow USB sticks! not thread-safe!!!(see ::GetFullPathName()) //macro substitution only Zstring expandMacros(const Zstring& text); -std::vector getDirectoryAliases(const Zstring& dirString); +std::vector getDirectoryAliases(const Zstring& dirString); //may block for slow USB sticks when resolving [] -#ifdef FFS_WIN +#ifdef ZEN_WIN //*blocks* if network is not reachable or when showing login prompt dialog! void loginNetworkShare(const Zstring& dirname, bool allowUserInteraction); //throw() - user interaction: show OS password prompt #endif -- cgit