diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-30 10:45:01 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-03-30 10:45:01 -0400 |
| commit | 25ccb2c7c31dd44d53fdea3b3610efcdffc8634c (patch) | |
| tree | f80750a2541379882a38ac449c0c2ad90e95c2ab | |
| parent | d9b8acd238ea26477c5f599b323777eaaf63c000 (diff) | |
| parent | d0b9ffb6304834915ae983ce44af1c92ec9cdd39 (diff) | |
| download | cmake-25ccb2c7c31dd44d53fdea3b3610efcdffc8634c.tar.gz | |
Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
KWSys 2021-03-30 (db93a594)
| -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 cf04799776..4d974a898b 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 4d1b46c871..9409d1b764 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) |