diff options
Diffstat (limited to 'wcsmbs')
| -rw-r--r-- | wcsmbs/wchar.h | 27 | ||||
| -rw-r--r-- | wcsmbs/wcstod.c | 2 | ||||
| -rw-r--r-- | wcsmbs/wcstod_l.c | 2 | ||||
| -rw-r--r-- | wcsmbs/wcstof.c | 2 | ||||
| -rw-r--r-- | wcsmbs/wcstof_l.c | 2 | ||||
| -rw-r--r-- | wcsmbs/wcstold.c | 2 | ||||
| -rw-r--r-- | wcsmbs/wcstold_l.c | 2 |
7 files changed, 12 insertions, 27 deletions
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index accd24a03e..9054661788 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -45,6 +45,9 @@ #if defined __USE_UNIX98 || defined __USE_XOPEN2K # include <bits/types/FILE.h> #endif +#ifdef __USE_XOPEN2K8 +# include <bits/types/locale_t.h> +#endif /* Tell the caller that we provide correct C++ prototypes. */ #if defined __cplusplus && __GNUC_PREREQ (4, 4) @@ -116,8 +119,6 @@ extern int wcsncasecmp (const wchar_t *__s1, const wchar_t *__s2, /* Similar to the two functions above but take the information from the provided locale and not the global locale. */ -# include <xlocale.h> - extern int wcscasecmp_l (const wchar_t *__s1, const wchar_t *__s2, __locale_t __loc) __THROW; @@ -435,23 +436,9 @@ extern unsigned long long int wcstouq (const wchar_t *__restrict __nptr, #endif /* Use GNU. */ #ifdef __USE_GNU -/* The concept of one static locale per category is not very well - thought out. Many applications will need to process its data using - information from several different locales. Another application is - the implementation of the internationalization handling in the - upcoming ISO C++ standard library. To support this another set of - the functions using locale data exist which have an additional - argument. - - Attention: all these functions are *not* standardized in any form. - This is a proof-of-concept implementation. */ - -/* Structure for reentrant locale using functions. This is an - (almost) opaque type for the user level programs. */ -# include <xlocale.h> - -/* Special versions of the functions above which take the locale to - use as an additional parameter. */ +/* Parallel versions of the functions above which take the locale to + use as an additional parameter. These are GNU extensions inspired + by the POSIX.1-2008 extended locale API. */ extern long int wcstol_l (const wchar_t *__restrict __nptr, wchar_t **__restrict __endptr, int __base, __locale_t __loc) __THROW; @@ -783,8 +770,6 @@ extern size_t wcsftime (wchar_t *__restrict __s, size_t __maxsize, const struct tm *__restrict __tp) __THROW; # ifdef __USE_GNU -# include <xlocale.h> - /* Similar to `wcsftime' but takes the information from the provided locale and not the global locale. */ extern size_t wcsftime_l (wchar_t *__restrict __s, size_t __maxsize, diff --git a/wcsmbs/wcstod.c b/wcsmbs/wcstod.c index b7db11b935..72fa7eaaa4 100644 --- a/wcsmbs/wcstod.c +++ b/wcsmbs/wcstod.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ #include <stddef.h> -#include <xlocale.h> +#include <locale.h> #define USE_WIDE_CHAR 1 diff --git a/wcsmbs/wcstod_l.c b/wcsmbs/wcstod_l.c index 5f7498c4f8..1d5c67cf36 100644 --- a/wcsmbs/wcstod_l.c +++ b/wcsmbs/wcstod_l.c @@ -18,7 +18,7 @@ <http://www.gnu.org/licenses/>. */ #include <stddef.h> -#include <xlocale.h> +#include <locale.h> extern double ____wcstod_l_internal (const wchar_t *, wchar_t **, int, diff --git a/wcsmbs/wcstof.c b/wcsmbs/wcstof.c index 29cdec3a98..67c16e0cfd 100644 --- a/wcsmbs/wcstof.c +++ b/wcsmbs/wcstof.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ #include <stddef.h> -#include <xlocale.h> +#include <locale.h> #define USE_WIDE_CHAR 1 diff --git a/wcsmbs/wcstof_l.c b/wcsmbs/wcstof_l.c index 23d402d7ea..d430bf1c3b 100644 --- a/wcsmbs/wcstof_l.c +++ b/wcsmbs/wcstof_l.c @@ -18,7 +18,7 @@ <http://www.gnu.org/licenses/>. */ #include <stddef.h> -#include <xlocale.h> +#include <locale.h> #define USE_WIDE_CHAR 1 diff --git a/wcsmbs/wcstold.c b/wcsmbs/wcstold.c index e5c1cc3071..816f43bf69 100644 --- a/wcsmbs/wcstold.c +++ b/wcsmbs/wcstold.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ #include <stddef.h> -#include <xlocale.h> +#include <locale.h> #define USE_WIDE_CHAR 1 diff --git a/wcsmbs/wcstold_l.c b/wcsmbs/wcstold_l.c index 3dd33a729a..86f63e8801 100644 --- a/wcsmbs/wcstold_l.c +++ b/wcsmbs/wcstold_l.c @@ -18,7 +18,7 @@ <http://www.gnu.org/licenses/>. */ #include <stddef.h> -#include <xlocale.h> +#include <locale.h> #define USE_WIDE_CHAR 1 |