diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-06-01 22:26:33 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-06-01 22:26:33 -0700 |
| commit | e10940f3f14e91e2740b139c1ff2983a88d66cc7 (patch) | |
| tree | b2ea1e4ee957458a16235b72c62021dbb2cfd515 | |
| parent | 8c3ed298a0a516ccd80393881f39d94b496c53d9 (diff) | |
| parent | 0260d2d2dbb2607e7310bdb518b7b6c0f58f5f98 (diff) | |
| download | emacs-e10940f3f14e91e2740b139c1ff2983a88d66cc7.tar.gz | |
Merge from origin/emacs-27
0260d2d2db Don't call 'mbrtowc' on WINDOWSNT
| -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 49793fd1e86..45a215b66e2 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; |