merge revision(s) b94b7965c420661ed621c146a4efaf43bc3cf50b: [Backport #17639]

	Fixed fallback ENABLE_VIRTUAL_TERMINAL_PROCESSING value [Bug #17639]

	---
	 ruby.c        | 2 +-
	 win32/win32.c | 4 ++--
	 2 files changed, 3 insertions(+), 3 deletions(-)

3 files changed, 4 insertions, 4 deletions

diff --git a/ruby.c b/ruby.c
index 1af326c8e1..9990882423 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1657,7 +1657,7 @@ tty_enabled(void)
     DWORD m;
     if (!GetConsoleMode(h, &m)) return 0;
 # ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
-#   define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x200
+#   define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x4
 # endif
     if (!(m & ENABLE_VIRTUAL_TERMINAL_PROCESSING)) return 0;
     return 1;
diff --git a/version.h b/version.h
index e69e98f7f2..bd7e54522b 100644
--- a/version.h
+++ b/version.h
@@ -12,7 +12,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 45
+#define RUBY_PATCHLEVEL 46
 
 #define RUBY_RELEASE_YEAR 2021
 #define RUBY_RELEASE_MONTH 3
diff --git a/win32/win32.c b/win32/win32.c
index cfc571f145..82d9f1d590 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -2693,7 +2693,7 @@ init_stdhandle(void)
         DWORD m;
         if (GetConsoleMode(h, &m)) {
 #ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
-#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x200
+#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x4
 #endif
             SetConsoleMode(h, m | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
         }
@@ -7285,7 +7285,7 @@ rb_w32_write_console(uintptr_t strarg, int fd)
 	break;
     }
     reslen = 0;
-    if (dwMode & 4) {	/* ENABLE_VIRTUAL_TERMINAL_PROCESSING */
+    if (dwMode & ENABLE_VIRTUAL_TERMINAL_PROCESSING) {
 	if (!WriteConsoleW(handle, ptr, len, &reslen, NULL))
 	    reslen = (DWORD)-1L;
     }