1
0
Эх сурвалжийг харах

Merge topic 'update-kwsys'

25ccb2c7c3 Merge branch 'upstream-KWSys' into update-kwsys
d0b9ffb630 KWSys 2021-03-30 (db93a594)

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5960
Brad King 4 жил өмнө
parent
commit
cda40a42f1

+ 1 - 1
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)
 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.
   // On Windows, the name must be at least two characters long.
   if (len < 2) {
   if (len < 2) {
     return false;
     return false;

+ 1 - 1
Source/kwsys/Terminal.c

@@ -10,7 +10,7 @@
 #endif
 #endif
 
 
 /* Configure support for this platform.  */
 /* Configure support for this platform.  */
-#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined(_WIN32)
 #  define KWSYS_TERMINAL_SUPPORT_CONSOLE
 #  define KWSYS_TERMINAL_SUPPORT_CONSOLE
 #endif
 #endif
 #if !defined(_WIN32)
 #if !defined(_WIN32)