2 files changed, 12 insertions, 6 deletions

diff --git a/win32/termios.c b/win32/termios.c
index 23184e901..7d6adaafe 100644
--- a/win32/termios.c
+++ b/win32/termios.c
@@ -34,7 +34,7 @@ int64_t FAST_FUNC windows_read_key(int fd, char *buf UNUSED_PARAM, int timeout)
         INPUT_RECORD record;
         DWORD nevent_out, mode;
         int ret = -1;
-#if ENABLE_FEATURE_EURO_INPUT
+#if !ENABLE_FEATURE_UTF8_INPUT
         wchar_t uchar;
         char achar;
 #endif
@@ -54,7 +54,7 @@ int64_t FAST_FUNC windows_read_key(int fd, char *buf UNUSED_PARAM, int timeout)
                         if (WaitForSingleObject(cin, timeout) != WAIT_OBJECT_0)
                                 goto done;
                 }
-#if ENABLE_FEATURE_EURO_INPUT
+#if !ENABLE_FEATURE_UTF8_INPUT
                 if (!ReadConsoleInputW(cin, &record, 1, &nevent_out))
 #else
                 if (!readConsoleInput_utf8(cin, &record, 1, &nevent_out))
@@ -73,7 +73,7 @@ int64_t FAST_FUNC windows_read_key(int fd, char *buf UNUSED_PARAM, int timeout)
                 }
                 alt_pressed = state & LEFT_ALT_PRESSED;
 
-#if ENABLE_FEATURE_EURO_INPUT
+#if !ENABLE_FEATURE_UTF8_INPUT
                 if (!record.Event.KeyEvent.uChar.UnicodeChar) {
 #else
                 if (!record.Event.KeyEvent.uChar.AsciiChar) {
@@ -119,7 +119,7 @@ int64_t FAST_FUNC windows_read_key(int fd, char *buf UNUSED_PARAM, int timeout)
                                 ret &= ~0x80;
                         goto done;
                 }
-#if ENABLE_FEATURE_EURO_INPUT
+#if !ENABLE_FEATURE_UTF8_INPUT
                 uchar = record.Event.KeyEvent.uChar.UnicodeChar;
                 achar = uchar & 0x7f;
                 if (achar != uchar)
diff --git a/win32/winansi.c b/win32/winansi.c
index 83ce076c0..479e5ca40 100644
--- a/win32/winansi.c
+++ b/win32/winansi.c
@@ -749,8 +749,12 @@ BOOL conToCharBuffA(LPSTR s, DWORD len)
         CPINFO acp_info, con_info;
         WCHAR *buf;
 
-        // if acp is UTF8 then we got UTF8 via readConsoleInput_utf8
-        if (acp == conicp || acp == CP_UTF8)
+        if (acp == conicp
+#if ENABLE_FEATURE_UTF8_INPUT
+                        // if acp is UTF8 then we got UTF8 via readConsoleInput_utf8
+                        || acp == CP_UTF8
+#endif
+                )
                 return TRUE;
 
         if (!s || !GetCPInfo(acp, &acp_info) || !GetCPInfo(conicp, &con_info) ||
@@ -1173,6 +1177,7 @@ int mingw_isatty(int fd)
         return result;
 }
 
+#if ENABLE_FEATURE_UTF8_INPUT
 // intentionally also converts invalid values (surrogate halfs, too big)
 static int toutf8(DWORD cp, unsigned char *buf) {
         if (cp <= 0x7f) {
@@ -1343,3 +1348,4 @@ BOOL readConsoleInput_utf8(HANDLE h, INPUT_RECORD *r, DWORD len, DWORD *got)
         *got = 1;
         return TRUE;
 }
+#endif