diff options
author | KWSys Upstream <kwrobot@kitware.com> | 2021-03-30 13:46:09 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2021-03-30 14:45:01 (GMT) |
commit | d0b9ffb6304834915ae983ce44af1c92ec9cdd39 (patch) | |
tree | b94d4e79d9d96946966d29985b4cf2e13513c5d5 | |
parent | 9e556829c8fd2e78860e798f454f90dc1160dd20 (diff) | |
download | CMake-d0b9ffb6304834915ae983ce44af1c92ec9cdd39.zip CMake-d0b9ffb6304834915ae983ce44af1c92ec9cdd39.tar.gz CMake-d0b9ffb6304834915ae983ce44af1c92ec9cdd39.tar.bz2 |
KWSys 2021-03-30 (db93a594)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit db93a5948e331c8920ac701e35b2f7e283646cae (master).
Upstream Shortlog
-----------------
Lemures Lemniscati (2):
9a6d6c54 Terminal: Avoid using Windows functions on Cygwin
4c61b968 SystemTools::FileIsFullPath: Do not accept Windows paths on Cygwin
-rw-r--r-- | SystemTools.cxx | 2 | ||||
-rw-r--r-- | Terminal.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/SystemTools.cxx b/SystemTools.cxx index cf04799..4d974a8 100644 --- a/SystemTools.cxx +++ b/SystemTools.cxx @@ -3926,7 +3926,7 @@ bool SystemTools::FileIsFullPath(const char* in_name) bool SystemToolsStatic::FileIsFullPath(const char* in_name, size_t len) { -#if defined(_WIN32) || defined(__CYGWIN__) +#if defined(_WIN32) && !defined(__CYGWIN__) // On Windows, the name must be at least two characters long. if (len < 2) { return false; @@ -10,7 +10,7 @@ #endif /* Configure support for this platform. */ -#if defined(_WIN32) || defined(__CYGWIN__) +#if defined(_WIN32) # define KWSYS_TERMINAL_SUPPORT_CONSOLE #endif #if !defined(_WIN32) |