From 0260d2d2dbb2607e7310bdb518b7b6c0f58f5f98 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 1 Jun 2020 18:57:39 +0300 Subject: [PATCH] Don't call 'mbrtowc' on WINDOWSNT * src/emacs.c (using_utf8): Don't call 'mbrtowc' on WINDOWSNT systems, as it's not available on Windows 9X. --- src/emacs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/emacs.c b/src/emacs.c index db3e92a4773..6118ad34454 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -358,7 +358,10 @@ setlocale (int cat, char const *locale) static bool using_utf8 (void) { -#ifdef HAVE_WCHAR_H + /* We don't want to compile in mbrtowc on WINDOWSNT because that + will prevent Emacs from starting on older Windows systems, while + the result is known in advance anyway... */ +#if defined HAVE_WCHAR_H && !defined WINDOWSNT wchar_t wc; mbstate_t mbs = { 0 }; return mbrtowc (&wc, "\xc4\x80", 2, &mbs) == 2 && wc == 0x100; -- 2.39.2