- ifdef'd out include of xlocale.h for glibc, since the glibc

locale.h includes xlocale.h or, in glibc 2.26, its replacement.
    expeditor.c

original commit: b04e9123a427034a39fc9084ba2a8b04608bbb3b
This commit is contained in:
dyb 2017-10-13 16:59:16 -04:00
parent 09366c6247
commit 3f79fa0c65
2 changed files with 5 additions and 0 deletions

3
LOG
View File

@ -633,3 +633,6 @@
than leaving the enforcement to cond.
syntax.ss,
4.ms, root-experr*, patch*
- ifdef'd out include of xlocale.h for glibc, since the glibc
locale.h includes xlocale.h or, in glibc 2.26, its replacement.
expeditor.c

View File

@ -546,7 +546,9 @@ static void s_ee_write_char(wchar_t c) {
#include <sys/ioctl.h>
#include <wchar.h>
#include <locale.h>
#ifndef __GLIBC__
#include <xlocale.h>
#endif
#if defined(TIOCGWINSZ) && defined(SIGWINCH) && defined(EINTR)
#define HANDLE_SIGWINCH