diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-31 13:27:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-31 13:27:58 (GMT) |
| commit | cda40a42f1c16ac91b4a3dc158d74b708d4eea06 (patch) | |
| tree | b2c63c1870f8fcb1f106dd4c19b16f113beeb716 /Source | |
| parent | 0d54fa0275e022c1b4ae3c1cd52202944ce25d22 (diff) | |
| parent | 25ccb2c7c31dd44d53fdea3b3610efcdffc8634c (diff) | |
| download | CMake-cda40a42f1c16ac91b4a3dc158d74b708d4eea06.zip CMake-cda40a42f1c16ac91b4a3dc158d74b708d4eea06.tar.gz CMake-cda40a42f1c16ac91b4a3dc158d74b708d4eea06.tar.bz2 | |
Merge topic 'update-kwsys'
25ccb2c7c3 Merge branch 'upstream-KWSys' into update-kwsys
d0b9ffb630 KWSys 2021-03-30 (db93a594)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5960
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 2 | ||||
| -rw-r--r-- | Source/kwsys/Terminal.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index cf04799..4d974a8 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/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; diff --git a/Source/kwsys/Terminal.c b/Source/kwsys/Terminal.c index 4d1b46c..9409d1b 100644 --- a/Source/kwsys/Terminal.c +++ b/Source/kwsys/Terminal.c @@ -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) |