From: DannyDaemonic <redacted>
Date: Thu, 10 Aug 2023 20:11:36 +0000 (-0700)
Subject: Handle `ENABLE_VIRTUAL_TERMINAL_PROCESSING` more gracefully on earlier versions of... 
X-Git-Tag: gguf-v0.4.0~331
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=9ca4abed893685692f90413e4d43153af12342d9;p=pkg%2Fggml%2Fsources%2Fllama.cpp

Handle `ENABLE_VIRTUAL_TERMINAL_PROCESSING` more gracefully on earlier versions of Windows.
---

diff --git a/examples/console.cpp b/examples/console.cpp
index 8966b107..8efa2a67 100644
--- a/examples/console.cpp
+++ b/examples/console.cpp
@@ -10,6 +10,9 @@
 #include <windows.h>
 #include <fcntl.h>
 #include <io.h>
+#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
+#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
+#endif
 #else
 #include <climits>
 #include <sys/ioctl.h>
@@ -68,9 +71,10 @@ namespace console {
             }
         }
         if (hConsole) {
-            // Enable ANSI colors on Windows 10+
-            if (advanced_display && !(dwMode & ENABLE_VIRTUAL_TERMINAL_PROCESSING)) {
-                SetConsoleMode(hConsole, dwMode | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
+            // Check conditions combined to reduce nesting
+            if (advanced_display && !(dwMode & ENABLE_VIRTUAL_TERMINAL_PROCESSING) &&
+                !SetConsoleMode(hConsole, dwMode | ENABLE_VIRTUAL_TERMINAL_PROCESSING)) {
+                advanced_display = false;
             }
             // Set console output codepage to UTF8
             SetConsoleOutputCP(CP_UTF8);