aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--newlib/libc/include/ctype.h2
-rw-r--r--newlib/libc/include/inttypes.h2
-rw-r--r--newlib/libc/include/langinfo.h2
-rw-r--r--newlib/libc/include/locale.h2
-rw-r--r--newlib/libc/include/stdlib.h2
-rw-r--r--newlib/libc/include/string.h2
-rw-r--r--newlib/libc/include/strings.h2
-rw-r--r--newlib/libc/include/sys/_locale.h (renamed from newlib/libc/include/xlocale.h)6
-rw-r--r--newlib/libc/include/time.h2
-rw-r--r--newlib/libc/include/wchar.h2
-rw-r--r--newlib/libc/include/wctype.h2
-rw-r--r--winsup/cygwin/include/monetary.h2
-rw-r--r--winsup/cygwin/release/3.1.03
-rw-r--r--winsup/doc/new-features.xml6
14 files changed, 23 insertions, 14 deletions
diff --git a/newlib/libc/include/ctype.h b/newlib/libc/include/ctype.h
index 1cee695..a0009af 100644
--- a/newlib/libc/include/ctype.h
+++ b/newlib/libc/include/ctype.h
@@ -5,7 +5,7 @@
#include <sys/cdefs.h>
#if __POSIX_VISIBLE >= 200809 || __MISC_VISIBLE || defined (_COMPILING_NEWLIB)
-#include <xlocale.h>
+#include <sys/_locale.h>
#endif
_BEGIN_STD_C
diff --git a/newlib/libc/include/inttypes.h b/newlib/libc/include/inttypes.h
index 694ba8f..0732154 100644
--- a/newlib/libc/include/inttypes.h
+++ b/newlib/libc/include/inttypes.h
@@ -22,7 +22,7 @@
#include <stddef.h>
#if __BSD_VISIBLE
-#include <xlocale.h>
+#include <sys/_locale.h>
#endif
#define __STRINGIFY(a) #a
diff --git a/newlib/libc/include/langinfo.h b/newlib/libc/include/langinfo.h
index d2b7a03..fcf986c 100644
--- a/newlib/libc/include/langinfo.h
+++ b/newlib/libc/include/langinfo.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
#ifndef _NL_ITEM_DECLARED
diff --git a/newlib/libc/include/locale.h b/newlib/libc/include/locale.h
index d11eb00..8abb8db 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 <xlocale.h>
+#include <sys/_locale.h>
#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 933d181..15b3494 100644
--- a/newlib/libc/include/stdlib.h
+++ b/newlib/libc/include/stdlib.h
@@ -27,7 +27,7 @@
#endif
#if __GNU_VISIBLE
-#include <xlocale.h>
+#include <sys/_locale.h>
#endif
_BEGIN_STD_C
diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h
index 04c4d18..60e837b 100644
--- a/newlib/libc/include/string.h
+++ b/newlib/libc/include/string.h
@@ -17,7 +17,7 @@
#include <stddef.h>
#if __POSIX_VISIBLE >= 200809
-#include <xlocale.h>
+#include <sys/_locale.h>
#endif
#if __BSD_VISIBLE
diff --git a/newlib/libc/include/strings.h b/newlib/libc/include/strings.h
index 7e2e557..f0f7ee1 100644
--- a/newlib/libc/include/strings.h
+++ b/newlib/libc/include/strings.h
@@ -33,7 +33,7 @@
#include <sys/_types.h>
#if __POSIX_VISIBLE >= 200809
-#include <xlocale.h>
+#include <sys/_locale.h>
#endif
#ifndef _SIZE_T_DECLARED
diff --git a/newlib/libc/include/xlocale.h b/newlib/libc/include/sys/_locale.h
index f955426..ce6f995 100644
--- a/newlib/libc/include/xlocale.h
+++ b/newlib/libc/include/sys/_locale.h
@@ -1,7 +1,7 @@
/* Definition of opaque POSIX-1.2008 type locale_t for userspace. */
-#ifndef _XLOCALE_H
-#define _XLOCALE_H
+#ifndef _SYS__LOCALE_H
+#define _SYS__LOCALE_H
#include <newlib.h>
#include <sys/config.h>
@@ -9,4 +9,4 @@
struct __locale_t;
typedef struct __locale_t *locale_t;
-#endif /* _XLOCALE_H */
+#endif /* _SYS__LOCALE_H */
diff --git a/newlib/libc/include/time.h b/newlib/libc/include/time.h
index d69d199..3031590 100644
--- a/newlib/libc/include/time.h
+++ b/newlib/libc/include/time.h
@@ -29,7 +29,7 @@
#include <sys/timespec.h>
#if __POSIX_VISIBLE >= 200809
-#include <xlocale.h>
+#include <sys/_locale.h>
#endif
_BEGIN_STD_C
diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h
index 9f2441c..c04a651 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 <xlocale.h>
+#include <sys/_locale.h>
#endif
_BEGIN_STD_C
diff --git a/newlib/libc/include/wctype.h b/newlib/libc/include/wctype.h
index 9b71090..e5452bf 100644
--- a/newlib/libc/include/wctype.h
+++ b/newlib/libc/include/wctype.h
@@ -8,7 +8,7 @@
#include <stddef.h>
#if __POSIX_VISIBLE >= 200809
-#include <xlocale.h>
+#include <sys/_locale.h>
#endif
#ifndef WEOF
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
---------
diff --git a/winsup/doc/new-features.xml b/winsup/doc/new-features.xml
index 1ce011e..49aa5da 100644
--- a/winsup/doc/new-features.xml
+++ b/winsup/doc/new-features.xml
@@ -9,6 +9,12 @@
<itemizedlist mark="bullet">
<listitem><para>
+Eliminate a header file name collision with &lt;X11/XLocale.h&gt; on
+case insensitive filesystems by reverting &lt;xlocale.h&gt; back to
+&lt;sys/_locale.h&gt;.
+</para></listitem>
+
+<listitem><para>
FIFOs can now be opened multiple times for writing.
</para></listitem>