diff options
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/monetary.h | 3 | ||||
| -rw-r--r-- | stdlib/stdlib.h | 22 | ||||
| -rw-r--r-- | stdlib/strtod_l.c | 3 | ||||
| -rw-r--r-- | stdlib/strtof_l.c | 2 | ||||
| -rw-r--r-- | stdlib/strtol_l.c | 1 | ||||
| -rw-r--r-- | stdlib/strtold_l.c | 6 | ||||
| -rw-r--r-- | stdlib/strtoll_l.c | 2 | ||||
| -rw-r--r-- | stdlib/strtoul_l.c | 2 | ||||
| -rw-r--r-- | stdlib/strtoull_l.c | 2 |
9 files changed, 13 insertions, 30 deletions
diff --git a/stdlib/monetary.h b/stdlib/monetary.h index dcfbfc5262..c1fcbf06d1 100644 --- a/stdlib/monetary.h +++ b/stdlib/monetary.h @@ -40,7 +40,8 @@ extern ssize_t strfmon (char *__restrict __s, size_t __maxsize, __THROW __attribute_format_strfmon__ (3, 4); #ifdef __USE_XOPEN2K8 -# include <xlocale.h> +/* POSIX.1-2008 extended locale interface (see locale.h). */ +# include <bits/types/locale_t.h> /* Formatting a monetary value according to the given locale. */ extern ssize_t strfmon_l (char *__restrict __s, size_t __maxsize, diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h index 6f1e70e254..ce2602e03a 100644 --- a/stdlib/stdlib.h +++ b/stdlib/stdlib.h @@ -193,23 +193,11 @@ extern int strfromf128 (char *__dest, size_t __size, const char * __format, #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 problem is - the implementation of the internationalization handling in the - ISO C++ standard library. To support this another set of - the functions using locale data exist which take an additional - argument. - - Attention: even though several *_l interfaces are part of POSIX:2008, - these are not. */ - -/* 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. */ +# include <bits/types/locale_t.h> + extern long int strtol_l (const char *__restrict __nptr, char **__restrict __endptr, int __base, __locale_t __loc) __THROW __nonnull ((1, 4)); diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c index 99c2af357e..a782a2434b 100644 --- a/stdlib/strtod_l.c +++ b/stdlib/strtod_l.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <xlocale.h> +#include <locale.h> extern double ____strtod_l_internal (const char *, char **, int, __locale_t); @@ -46,7 +46,6 @@ extern double ____strtod_l_internal (const char *, char **, int, __locale_t); #include <errno.h> #include <float.h> #include "../locale/localeinfo.h" -#include <locale.h> #include <math.h> #include <math_private.h> #include <stdlib.h> diff --git a/stdlib/strtof_l.c b/stdlib/strtof_l.c index 57e557516a..ea76c344f4 100644 --- a/stdlib/strtof_l.c +++ b/stdlib/strtof_l.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <xlocale.h> +#include <locale.h> extern float ____strtof_l_internal (const char *, char **, int, __locale_t); diff --git a/stdlib/strtol_l.c b/stdlib/strtol_l.c index 5a0683b2bb..48e9ab5310 100644 --- a/stdlib/strtol_l.c +++ b/stdlib/strtol_l.c @@ -41,7 +41,6 @@ #include <stdlib.h> #include <string.h> #include <locale.h> -#include <xlocale.h> #include <stdint.h> #include <bits/wordsize.h> diff --git a/stdlib/strtold_l.c b/stdlib/strtold_l.c index bef2a4d3d7..7b9efd8819 100644 --- a/stdlib/strtold_l.c +++ b/stdlib/strtold_l.c @@ -17,11 +17,7 @@ #include <math.h> #include <stdlib.h> -#include <xlocale.h> - -#if defined _LIBC || defined HAVE_WCHAR_H -# include <wchar.h> -#endif +#include <wchar.h> #ifdef USE_WIDE_CHAR # define STRING_TYPE wchar_t diff --git a/stdlib/strtoll_l.c b/stdlib/strtoll_l.c index 2a712eb80e..003f425db8 100644 --- a/stdlib/strtoll_l.c +++ b/stdlib/strtoll_l.c @@ -19,7 +19,7 @@ #define QUAD 1 -#include <xlocale.h> +#include <locale.h> extern long long int ____strtoll_l_internal (const char *, char **, int, int, __locale_t); diff --git a/stdlib/strtoul_l.c b/stdlib/strtoul_l.c index 6d23ee2964..45b0585342 100644 --- a/stdlib/strtoul_l.c +++ b/stdlib/strtoul_l.c @@ -19,7 +19,7 @@ #define UNSIGNED 1 -#include <xlocale.h> +#include <locale.h> extern unsigned long int ____strtoul_l_internal (const char *, char **, int, int, __locale_t); diff --git a/stdlib/strtoull_l.c b/stdlib/strtoull_l.c index 53ecb916df..da6d7cde8c 100644 --- a/stdlib/strtoull_l.c +++ b/stdlib/strtoull_l.c @@ -20,7 +20,7 @@ #define QUAD 1 #define UNSIGNED 1 -#include <xlocale.h> +#include <locale.h> extern unsigned long long int ____strtoull_l_internal (const char *, char **, int, int, __locale_t); |