Cleanup use of HAVE_WIN32_VT100 in color.cc

1 files changed, 14 insertions, 22 deletions

diff --git a/src/color.cc b/src/color.cc
index 15e9eb90..66b8555e 100644
--- a/src/color.cc
+++ b/src/color.cc
@@ -20,11 +20,9 @@
 
 #include "wabt/common.h"
 
-#if _WIN32
 #if HAVE_WIN32_VT100
 #include <io.h>
 #include <windows.h>
-#endif
 #elif HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -42,29 +40,23 @@ bool Color::SupportsColor(FILE* file) {
     return atoi(force) != 0;
   }
 
-#if _WIN32
-
-  {
 #if HAVE_WIN32_VT100
-    HANDLE handle;
-    if (file == stdout) {
-      handle = GetStdHandle(STD_OUTPUT_HANDLE);
-    } else if (file == stderr) {
-      handle = GetStdHandle(STD_ERROR_HANDLE);
-    } else {
-      return false;
-    }
-    DWORD mode;
-    if (!_isatty(_fileno(file)) || !GetConsoleMode(handle, &mode) ||
-        !SetConsoleMode(handle, mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING)) {
-      return false;
-    }
-    return true;
-#else
-    // TODO(binji): Support older Windows by using SetConsoleTextAttribute?
+
+  HANDLE handle;
+  if (file == stdout) {
+    handle = GetStdHandle(STD_OUTPUT_HANDLE);
+  } else if (file == stderr) {
+    handle = GetStdHandle(STD_ERROR_HANDLE);
+  } else {
+    return false;
+  }
+  DWORD mode;
+  if (!_isatty(_fileno(file)) || !GetConsoleMode(handle, &mode) ||
+      !SetConsoleMode(handle, mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING)) {
     return false;
-#endif
   }
+  return true;
+  // TODO(binji): Support older Windows by using SetConsoleTextAttribute?
 
 #elif HAVE_UNISTD_H