From e604209cb930c5bc7e53f58625407b82e6899d0f Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 16 May 2014 12:39:46 -0400 Subject: KWSys SystemTools: Port cygwin path conversion to modern API The cygwin_conv_to_win32_path function is deprecated in favor of cygwin_conv_path. Use the latter. --- Source/kwsys/SystemTools.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index f4a443f..e5d8bde 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -92,7 +92,7 @@ extern char **environ; #endif #ifdef __CYGWIN__ -extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32_path); +# include #endif // getpwnam doesn't exist on Windows and Cray Xt3/Catamount @@ -1110,7 +1110,10 @@ bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path) } else { - cygwin_conv_to_win32_path(path, win32_path); + if(cygwin_conv_path(CCP_POSIX_TO_WIN_A, path, win32_path, MAX_PATH) != 0) + { + win32_path[0] = 0; + } SystemToolsTranslationMap::value_type entry(path, win32_path); SystemTools::Cyg2Win32Map->insert(entry); } -- cgit v0.12