kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2014-05-16 12:39:46 -04:00
parent 5527cfa002
commit e604209cb9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/kwsys/SystemTools.cxx
View File

@ -92,7 +92,7 @@ extern char **environ;
#endif #endif
#ifdef __CYGWIN__ #ifdef __CYGWIN__
extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32_path); # include <sys/cygwin.h>
#endif #endif
// getpwnam doesn't exist on Windows and Cray Xt3/Catamount // getpwnam doesn't exist on Windows and Cray Xt3/Catamount
@ -1110,7 +1110,10 @@ bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path)
} }
else 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); SystemToolsTranslationMap::value_type entry(path, win32_path);
SystemTools::Cyg2Win32Map->insert(entry); SystemTools::Cyg2Win32Map->insert(entry);
} }