From ad101bcb0f55f0eb1a9f60187f949c3decd855e4 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 12 Jun 2019 22:31:14 +0200 Subject: Rename back to libX11 provides . 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. --- newlib/libc/include/ctype.h | 2 +- newlib/libc/include/inttypes.h | 2 +- newlib/libc/include/langinfo.h | 2 +- newlib/libc/include/locale.h | 2 +- newlib/libc/include/stdlib.h | 2 +- newlib/libc/include/string.h | 2 +- newlib/libc/include/strings.h | 2 +- newlib/libc/include/sys/_locale.h | 12 ++++++++++++ newlib/libc/include/time.h | 2 +- newlib/libc/include/wchar.h | 2 +- newlib/libc/include/wctype.h | 2 +- newlib/libc/include/xlocale.h | 12 ------------ winsup/cygwin/include/monetary.h | 2 +- winsup/cygwin/release/3.1.0 | 3 +++ winsup/doc/new-features.xml | 6 ++++++ 15 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 newlib/libc/include/sys/_locale.h delete mode 100644 newlib/libc/include/xlocale.h diff --git a/newlib/libc/include/ctype.h b/newlib/libc/include/ctype.h index 1cee6953b..a0009af17 100644 --- a/newlib/libc/include/ctype.h +++ b/newlib/libc/include/ctype.h @@ -5,7 +5,7 @@ #include #if __POSIX_VISIBLE >= 200809 || __MISC_VISIBLE || defined (_COMPILING_NEWLIB) -#include +#include #endif _BEGIN_STD_C diff --git a/newlib/libc/include/inttypes.h b/newlib/libc/include/inttypes.h index 694ba8fcf..073215476 100644 --- a/newlib/libc/include/inttypes.h +++ b/newlib/libc/include/inttypes.h @@ -22,7 +22,7 @@ #include #if __BSD_VISIBLE -#include +#include #endif #define __STRINGIFY(a) #a diff --git a/newlib/libc/include/langinfo.h b/newlib/libc/include/langinfo.h index d2b7a031c..fcf986cce 100644 --- a/newlib/libc/include/langinfo.h +++ b/newlib/libc/include/langinfo.h @@ -32,7 +32,7 @@ #include #include #if __POSIX_VISIBLE >= 200809 -#include +#include #endif #ifndef _NL_ITEM_DECLARED diff --git a/newlib/libc/include/locale.h b/newlib/libc/include/locale.h index d11eb00fb..8abb8db92 100644 --- a/newlib/libc/include/locale.h +++ b/newlib/libc/include/locale.h @@ -23,7 +23,7 @@ #if __POSIX_VISIBLE >= 200809 || defined (_COMPILING_NEWLIB) -#include +#include #define LC_ALL_MASK (1 << LC_ALL) #define LC_COLLATE_MASK (1 << LC_COLLATE) diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h index 933d181e1..15b349440 100644 --- a/newlib/libc/include/stdlib.h +++ b/newlib/libc/include/stdlib.h @@ -27,7 +27,7 @@ #endif #if __GNU_VISIBLE -#include +#include #endif _BEGIN_STD_C diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h index 04c4d1828..60e837bc0 100644 --- a/newlib/libc/include/string.h +++ b/newlib/libc/include/string.h @@ -17,7 +17,7 @@ #include #if __POSIX_VISIBLE >= 200809 -#include +#include #endif #if __BSD_VISIBLE diff --git a/newlib/libc/include/strings.h b/newlib/libc/include/strings.h index 7e2e557e7..f0f7ee137 100644 --- a/newlib/libc/include/strings.h +++ b/newlib/libc/include/strings.h @@ -33,7 +33,7 @@ #include #if __POSIX_VISIBLE >= 200809 -#include +#include #endif #ifndef _SIZE_T_DECLARED diff --git a/newlib/libc/include/sys/_locale.h b/newlib/libc/include/sys/_locale.h new file mode 100644 index 000000000..ce6f9955c --- /dev/null +++ b/newlib/libc/include/sys/_locale.h @@ -0,0 +1,12 @@ +/* Definition of opaque POSIX-1.2008 type locale_t for userspace. */ + +#ifndef _SYS__LOCALE_H +#define _SYS__LOCALE_H + +#include +#include + +struct __locale_t; +typedef struct __locale_t *locale_t; + +#endif /* _SYS__LOCALE_H */ diff --git a/newlib/libc/include/time.h b/newlib/libc/include/time.h index d69d19969..3031590b4 100644 --- a/newlib/libc/include/time.h +++ b/newlib/libc/include/time.h @@ -29,7 +29,7 @@ #include #if __POSIX_VISIBLE >= 200809 -#include +#include #endif _BEGIN_STD_C diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h index 9f2441c4f..c04a6510e 100644 --- a/newlib/libc/include/wchar.h +++ b/newlib/libc/include/wchar.h @@ -64,7 +64,7 @@ typedef __gnuc_va_list va_list; #endif #if __POSIX_VISIBLE >= 200809 -#include +#include #endif _BEGIN_STD_C diff --git a/newlib/libc/include/wctype.h b/newlib/libc/include/wctype.h index 9b710900d..e5452bfc3 100644 --- a/newlib/libc/include/wctype.h +++ b/newlib/libc/include/wctype.h @@ -8,7 +8,7 @@ #include #if __POSIX_VISIBLE >= 200809 -#include +#include #endif #ifndef WEOF diff --git a/newlib/libc/include/xlocale.h b/newlib/libc/include/xlocale.h deleted file mode 100644 index f9554269c..000000000 --- a/newlib/libc/include/xlocale.h +++ /dev/null @@ -1,12 +0,0 @@ -/* Definition of opaque POSIX-1.2008 type locale_t for userspace. */ - -#ifndef _XLOCALE_H -#define _XLOCALE_H - -#include -#include - -struct __locale_t; -typedef struct __locale_t *locale_t; - -#endif /* _XLOCALE_H */ diff --git a/winsup/cygwin/include/monetary.h b/winsup/cygwin/include/monetary.h index 82a6312bf..1c3479bd8 100644 --- a/winsup/cygwin/include/monetary.h +++ b/winsup/cygwin/include/monetary.h @@ -32,7 +32,7 @@ #include #include #if __POSIX_VISIBLE >= 200809 -#include +#include #endif __BEGIN_DECLS diff --git a/winsup/cygwin/release/3.1.0 b/winsup/cygwin/release/3.1.0 index fe65e5082..bdbbf092d 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 on case + insensitive filesystems by reverting back to . + Bug Fixes --------- diff --git a/winsup/doc/new-features.xml b/winsup/doc/new-features.xml index 1ce011e3b..49aa5da74 100644 --- a/winsup/doc/new-features.xml +++ b/winsup/doc/new-features.xml @@ -8,6 +8,12 @@ + +Eliminate a header file name collision with <X11/XLocale.h> on +case insensitive filesystems by reverting <xlocale.h> back to +<sys/_locale.h>. + + FIFOs can now be opened multiple times for writing. -- cgit v1.2.3