[PATCH] Include "xlocale.h", not <xlocale.h>.
Michael Haubenwallner <[email protected]>
| Newsgroups | gmane.comp.lib.newlib |
|---|---|
| Message-ID | <[email protected]> |
libX11 does provide an <X11/Xlocale.h>, and while building libX11 itself, they add their include/X11 to the compiler's include path. Now when newlib headers include <xlocale.h> on the case insensitive file system, the compiler does pick their Xlocale.h. So we better include "xlocale.h" in newlib headers instead, to prefer newlib xlocale.h from within newlib headers. --- 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/time.h | 2 +- newlib/libc/include/wchar.h | 2 +- newlib/libc/include/wctype.h | 2 +- winsup/cygwin/include/monetary.h | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/newlib/libc/include/ctype.h b/newlib/libc/include/ctype.h index 1cee6953b..562683a70 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 "xlocale.h" #endif _BEGIN_STD_C diff --git a/newlib/libc/include/inttypes.h b/newlib/libc/include/inttypes.h index 694ba8fcf..363d05f6f 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 "xlocale.h" #endif #define __STRINGIFY(a) #a diff --git a/newlib/libc/include/langinfo.h b/newlib/libc/include/langinfo.h index d2b7a031c..75ba4d92f 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 "xlocale.h" #endif #ifndef _NL_ITEM_DECLARED diff --git a/newlib/libc/include/locale.h b/newlib/libc/include/locale.h index d11eb00fb..17fa6a736 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 "xlocale.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 933d181e1..aebc15036 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 "xlocale.h" #endif _BEGIN_STD_C diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h index 04c4d1828..a35a00cc7 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 "xlocale.h" #endif #if __BSD_VISIBLE diff --git a/newlib/libc/include/strings.h b/newlib/libc/include/strings.h index 7e2e557e7..29e5f783c 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 "xlocale.h" #endif #ifndef _SIZE_T_DECLARED diff --git a/newlib/libc/include/time.h b/newlib/libc/include/time.h index d69d19969..9b67b847b 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 "xlocale.h" #endif _BEGIN_STD_C diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h index 9f2441c4f..a3a6698b4 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 "xlocale.h" #endif _BEGIN_STD_C diff --git a/newlib/libc/include/wctype.h b/newlib/libc/include/wctype.h index 9b710900d..4e3dc16e4 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 "xlocale.h" #endif #ifndef WEOF diff --git a/winsup/cygwin/include/monetary.h b/winsup/cygwin/include/monetary.h index 82a6312bf..4daabce0e 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 "xlocale.h" #endif __BEGIN_DECLS -- 2.21.0