diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-19 10:58:14 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-05-19 10:58:14 -0400 |
| commit | 2903d609b1629f0a250ff5ba4ac1018498b00495 (patch) | |
| tree | 6e1a551fd04ffd6058c20e4282beda540af22b65 /Source/kwsys/SystemTools.cxx | |
| parent | d5f8abc286ab69a0e136e51fec3d02acb7604abd (diff) | |
| parent | ed52685dd7ea5c54e7a5e6caa789293d76f10b15 (diff) | |
| download | cmake-2903d609b1629f0a250ff5ba4ac1018498b00495.tar.gz | |
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys/SystemTools.cxx')
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index a2681c162d..704cbbc1b0 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 <sys/cygwin.h> #endif // getpwnam doesn't exist on Windows and Cray Xt3/Catamount @@ -1113,7 +1113,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); } |