From 2e00d252091f76040d5257536e658caa7d9e8cf9 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 16 May 2014 12:39:46 -0400
Subject: [PATCH] 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.
Change-Id: I416c3b3360cd5085ed51dd60375c7e0b3b9ca1cb
---
SystemTools.cxx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/SystemTools.cxx b/SystemTools.cxx
index a2681c16..704cbbc1 100644
--- a/SystemTools.cxx
+++ b/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);
}
--
GitLab