diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2019-06-12 22:31:14 +0200 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2019-06-14 10:02:08 +0200 |
| commit | ad101bcb0f55f0eb1a9f60187f949c3decd855e4 (patch) | |
| tree | 47e50e28baefd8079fc020185942c0650fbb1340 /winsup/cygwin | |
| parent | 000f2409b118e85daaa7064b5375245b8f48ab27 (diff) | |
| download | newlib-ad101bcb0f55f0eb1a9f60187f949c3decd855e4.zip newlib-ad101bcb0f55f0eb1a9f60187f949c3decd855e4.tar.gz newlib-ad101bcb0f55f0eb1a9f60187f949c3decd855e4.tar.bz2 | |
Rename <xlocale.h> back to <sys/_locale.h>
libX11 provides <X11/Xlocale.h>. The build of libX11 itself adds
include/X11 to the compiler's include path. This results in a name
collision with /usr/include/xlocale.h on case-insensitive filesystems.
Commit 90e35b1eb3df renamed sys/_locale.h to xlocale.h in March 2017 under
the assumption that we should provide the locale_t type in the same file
as on Linux, FreeBSD, and Darwin.
A few weeks later (June 2017), glibc removed the xlocale.h file in favor
of bits/types/locale_t.h, which shouldn't be included directly anyway.
For reference and the reasoning, see
https://sourceware.org/git/?p=glibc.git;a=commit;h=f0be25b6336d
Given the above, revert 90e35b1eb3df4070e68afc5e7060665214d586be and
fix additional usage of xlocale.h.
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/include/monetary.h | 2 | ||||
| -rw-r--r-- | winsup/cygwin/release/3.1.0 | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/winsup/cygwin/include/monetary.h b/winsup/cygwin/include/monetary.h index 82a6312..1c3479b 100644 --- a/winsup/cygwin/include/monetary.h +++ b/winsup/cygwin/include/monetary.h @@ -32,7 +32,7 @@ #include <sys/cdefs.h> #include <sys/types.h> #if __POSIX_VISIBLE >= 200809 -#include <xlocale.h> +#include <sys/_locale.h> #endif __BEGIN_DECLS diff --git a/winsup/cygwin/release/3.1.0 b/winsup/cygwin/release/3.1.0 index fe65e50..bdbbf09 100644 --- a/winsup/cygwin/release/3.1.0 +++ b/winsup/cygwin/release/3.1.0 @@ -16,6 +16,9 @@ What changed: - If a SA_SIGINFO signal handler changes the ucontext_t pointed to by the third parameter, follow it after returning from the handler. +- Eliminate a header file name collision with <X11/XLocale.h> on case + insensitive filesystems by reverting <xlocale.h> back to <sys/_locale.h>. + Bug Fixes --------- |