diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2020-06-01 18:57:39 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2020-06-01 18:57:39 +0300 |
| commit | 0260d2d2dbb2607e7310bdb518b7b6c0f58f5f98 (patch) | |
| tree | c1f7047da8e0d0a4c4babeab895f0f7d36903fb8 /src/emacs.c | |
| parent | fb90f46f47731fffaccd02a55826298419609c77 (diff) | |
| download | emacs-0260d2d2dbb2607e7310bdb518b7b6c0f58f5f98.tar.gz | |
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.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; |