vala,libvaladoc: Properly check for colored terminal output on Windows

Additionally look for `_isatty()` and adjust for more possible results

Fixes https://gitlab.gnome.org/GNOME/vala/issues/1383

diff --git a/libvaladoc/errorreporter.vala b/libvaladoc/errorreporter.vala
index 68b09a8ef8ef4f6fc1e970f3d0a5f97548f675c3..d63ed6ecdb3985ac84d913a4bb492f4e6e01bea5 100644 (file)
--- a/libvaladoc/errorreporter.vala
+++ b/libvaladoc/errorreporter.vala
@@ -240,11 +240,14 @@ public class Valadoc.ErrorReporter : Object {
                void* _func;
                module.symbol ("isatty", out _func);
                if (_func == null) {
-                       return false;
+                       module.symbol ("_isatty", out _func);
+                       if (_func == null) {
+                               return false;
+                       }
                }
 
                AttyFunc? func = (AttyFunc) _func;
-               return func (fd) == 1;
+               return func (fd) > 0;
        }
 
        [PrintfFormat]

diff --git a/vala/valareport.vala b/vala/valareport.vala
index bdb11236fcd8f077957364a1285141296c043ee6..081f37c42b4b7e6a69fef0821a6dc04f1092e1fb 100644 (file)
--- a/vala/valareport.vala
+++ b/vala/valareport.vala
@@ -410,10 +410,13 @@ public class Vala.Report {
                void* _func;
                module.symbol ("isatty", out _func);
                if (_func == null) {
-                       return false;
+                       module.symbol ("_isatty", out _func);
+                       if (_func == null) {
+                               return false;
+                       }
                }
 
                AttyFunc? func = (AttyFunc) _func;
-               return func (fd) == 1;
+               return func (fd) > 0;
        }
 }