From 614992a65c26a267d4c95dbe7057b17476a9f45a Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 22 Oct 2020 16:41:23 -0600
Subject: [PATCH] Chez Scheme: more repairs to avoid xlocale and an
 old-compiler warning

---
 racket/src/ChezScheme/c/expeditor.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/racket/src/ChezScheme/c/expeditor.c b/racket/src/ChezScheme/c/expeditor.c
index 1e54d9137c..6dd849ba34 100644
--- a/racket/src/ChezScheme/c/expeditor.c
+++ b/racket/src/ChezScheme/c/expeditor.c
@@ -553,7 +553,7 @@ static void s_ee_write_char(wchar_t c) {
 #include <sys/ioctl.h>
 #include <wchar.h>
 #include <locale.h>
-#if !defined(__GLIBC__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__linux__)
+#if !defined(__GLIBC__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__linux__) && !defined(NO_USELOCALE)
 # include <xlocale.h>
 #endif
 
@@ -712,7 +712,8 @@ static ptr s_ee_read_char(IBOOL blockp) {
           return Schar(wch);
         }
       }
-    }
+    } else
+      sz = 0;
 
   } while ((n < 0 && errno == EINTR) || (n == 1 && sz == (size_t)-2));