@@ -77,6 +77,9 @@ Version 2.26
* The obsolete signal constant SIGUNUSED is no longer defined by <signal.h>.
+* The nonstandard header <xlocale.h> is deprecated, and will be removed in a
+ future release. Most programs should use <locale.h> instead.
+
* The reallocarray function has been added to libc. It is a realloc
replacement with a check for integer overflow when calculating total
allocation size.
@@ -233,20 +233,8 @@ __NTH (toupper (int __c))
#ifdef __USE_XOPEN2K8
-/* 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>
+/* POSIX.1-2008 extended locale interface (see locale.h). */
+# include <bits/types/locale_t.h>
/* These definitions are similar to the ones above but all functions
take as an argument a handle for the locale which shall be used. */
new file mode 100644
@@ -0,0 +1 @@
+#include <locale/bits/types/locale_t.h>
@@ -4,7 +4,7 @@
# ifndef _ISOMAC
-#include <xlocale.h>
+#include <bits/types/locale_t.h>
/* Now define the internal interfaces. */
extern int __printf_fphex (FILE *, const struct printf_info *,
@@ -2,7 +2,7 @@
#include <time/time.h>
#ifndef _ISOMAC
-# include <xlocale.h>
+# include <bits/types/locale_t.h>
extern __typeof (strftime_l) __strftime_l;
libc_hidden_proto (__strftime_l)
deleted file mode 100644
@@ -1 +0,0 @@
-#include <locale/xlocale.h>
@@ -22,7 +22,8 @@ subdir := locale
include ../Makeconfig
-headers = locale.h bits/locale.h langinfo.h xlocale.h
+headers = locale.h bits/locale.h bits/types/locale_t.h \
+ langinfo.h xlocale.h
routines = setlocale findlocale loadlocale loadarchive \
localeconv nl_langinfo nl_langinfo_l mb_cur_max \
newlocale duplocale freelocale uselocale
new file mode 100644
@@ -0,0 +1,44 @@
+/* Definition of locale datatype.
+ Copyright (C) 1997-2017 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _BITS_TYPES_LOCALE_T_H
+#define _BITS_TYPES_LOCALE_T_H 1
+
+/* POSIX.1-2008: the locale_t type, representing a locale context.
+ This type should be treated as opaque by applications; some details
+ are exposed for the sake of efficiency in e.g. ctype functions. */
+
+struct __locale_struct
+{
+ /* Note: LC_ALL is not a valid index into this array. */
+ struct __locale_data *__locales[13]; /* 13 = __LC_LAST. */
+
+ /* To increase the speed of this solution we add some special members. */
+ const unsigned short int *__ctype_b;
+ const int *__ctype_tolower;
+ const int *__ctype_toupper;
+
+ /* Note: LC_ALL is not a valid index into this array. */
+ const char *__names[13];
+};
+
+typedef struct __locale_struct *__locale_t;
+typedef struct __locale_struct *locale_t;
+
+#endif /* xlocale.h */
@@ -584,11 +584,8 @@ extern char *nl_langinfo (nl_item __item) __THROW;
#ifdef __USE_XOPEN2K8
-/* This interface is for the extended locale model. See <locale.h> for
- more information. */
-
-/* Get locale datatype definition. */
-# include <xlocale.h>
+/* POSIX.1-2008 extended locale interface (see locale.h). */
+# include <bits/types/locale_t.h>
/* Just like nl_langinfo but get the information from the locale object L. */
extern char *nl_langinfo_l (nl_item __item, __locale_t __l);
@@ -126,19 +126,13 @@ extern struct lconv *localeconv (void) __THROW;
#ifdef __USE_XOPEN2K8
-/* 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. */
-
-/* Get locale datatype definition. */
-# include <xlocale.h>
+/* POSIX.1-2008 extends the locale interface with functions for
+ explicit creation and manipulation of 'locale_t' objects
+ representing locale contexts, and a set of parallel
+ locale-sensitive text processing functions that take a locale_t
+ argument. This enables applications to work with data from
+ multiple locales simultaneously and thread-safely. */
+# include <bits/types/locale_t.h>
/* Return a reference to a data structure representing a set of locale
datasets. Unlike for the CATEGORY parameter for `setlocale' the
@@ -1,44 +1,14 @@
-/* Definition of locale datatype.
- Copyright (C) 1997-2017 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
#ifndef _XLOCALE_H
-#define _XLOCALE_H 1
+#define _XLOCALE_H
-/* Structure for reentrant locale using functions. This is an
- (almost) opaque type for the user level programs. The file and
- this data structure is not standardized. Don't rely on it. It can
- go away without warning. */
-typedef struct __locale_struct
-{
- /* Note: LC_ALL is not a valid index into this array. */
- struct __locale_data *__locales[13]; /* 13 = __LC_LAST. */
+/* xlocale.h was never intended to be a public header, but it existed
+ for a long time and was widely used enough that we are providing a
+ shim. If you have a concrete reason to want just the definition of
+ locale_t, not anything else from locale.h (for instance, you are a
+ library implementing a standard that places restrictions on what
+ symbols your headers may expose), use <bits/types/locale_t.h>. */
- /* To increase the speed of this solution we add some special members. */
- const unsigned short int *__ctype_b;
- const int *__ctype_tolower;
- const int *__ctype_toupper;
+#warning "xlocale.h is deprecated, use locale.h instead"
+#include <locale.h>
- /* Note: LC_ALL is not a valid index into this array. */
- const char *__names[13];
-} *__locale_t;
-
-/* POSIX 2008 makes locale_t official. */
-typedef __locale_t locale_t;
-
-#endif /* xlocale.h */
+#endif
@@ -78,6 +78,10 @@ for header in "$@"; do
(bits/* | regexp.h | rpcsvc/*.x)
continue;;
+ # xlocale.h contains an unconditional deprecation #warning.
+ (xlocale.h)
+ continue;;
+
# All extant versions of sys/elf.h contain nothing more than an
# exhortation (either a #warning or an #error) to use sys/procfs.h
# instead, plus an inclusion of that header.
@@ -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,
@@ -186,23 +186,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.
+/* 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>
- 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. */
extern long int strtol_l (const char *__restrict __nptr,
char **__restrict __endptr, int __base,
__locale_t __loc) __THROW __nonnull ((1, 4));
@@ -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>
@@ -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);
@@ -41,7 +41,6 @@
#include <stdlib.h>
#include <string.h>
#include <locale.h>
-#include <xlocale.h>
#include <stdint.h>
#include <bits/wordsize.h>
@@ -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
@@ -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);
@@ -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);
@@ -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);
@@ -148,7 +148,8 @@ extern size_t strxfrm (char *__restrict __dest,
__THROW __nonnull ((2));
#ifdef __USE_XOPEN2K8
-# include <xlocale.h>
+/* POSIX.1-2008 extended locale interface (see locale.h). */
+# include <bits/types/locale_t.h>
/* Compare the collated forms of S1 and S2, using sorting rules from L. */
extern int strcoll_l (const char *__s1, const char *__s2, __locale_t __l)
@@ -121,7 +121,8 @@ extern int strncasecmp (const char *__s1, const char *__s2, size_t __n)
__THROW __attribute_pure__ __nonnull ((1, 2));
#ifdef __USE_XOPEN2K8
-# include <xlocale.h>
+/* POSIX.1-2008 extended locale interface (see locale.h). */
+# include <bits/types/locale_t.h>
/* Compare S1 and S2, ignoring case, using collation rules from LOC. */
extern int strcasecmp_l (const char *__s1, const char *__s2, __locale_t __loc)
@@ -18,7 +18,6 @@
#include <math.h>
#include <stdlib.h>
#include <wchar.h>
-#include <xlocale.h>
/* The actual implementation for all floating point sizes is in strtod.c.
These macros tell it to produce the `long double' version, `strtold'. */
@@ -18,7 +18,6 @@
#include <math.h>
#include <stdlib.h>
#include <wchar.h>
-#include <xlocale.h>
/* The actual implementation for all floating point sizes is in strtod.c.
These macros tell it to produce the `long double' version, `strtold'. */
@@ -57,7 +57,7 @@ typedef __pid_t pid_t;
#endif
#ifdef __USE_XOPEN2K8
-# include <xlocale.h>
+# include <bits/types/locale_t.h>
#endif
#ifdef __USE_ISOC11
@@ -42,6 +42,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)
@@ -113,8 +116,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;
@@ -426,23 +427,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;
@@ -768,8 +755,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,
@@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/>. */
#include <stddef.h>
-#include <xlocale.h>
+#include <locale.h>
#define USE_WIDE_CHAR 1
@@ -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,
@@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/>. */
#include <stddef.h>
-#include <xlocale.h>
+#include <locale.h>
#define USE_WIDE_CHAR 1
@@ -18,7 +18,7 @@
<http://www.gnu.org/licenses/>. */
#include <stddef.h>
-#include <xlocale.h>
+#include <locale.h>
#define USE_WIDE_CHAR 1
@@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/>. */
#include <stddef.h>
-#include <xlocale.h>
+#include <locale.h>
#define USE_WIDE_CHAR 1
@@ -18,7 +18,7 @@
<http://www.gnu.org/licenses/>. */
#include <stddef.h>
-#include <xlocale.h>
+#include <locale.h>
#define USE_WIDE_CHAR 1
@@ -55,8 +55,8 @@ extern wctrans_t wctrans (const char *__property) __THROW;
extern wint_t towctrans (wint_t __wc, wctrans_t __desc) __THROW;
# ifdef __USE_XOPEN2K8
-/* Declare the interface to extended locale model. */
-# include <xlocale.h>
+/* POSIX.1-2008 extended locale interface (see locale.h). */
+# include <bits/types/locale_t.h>
/* Test for any wide character for which `iswalpha' or `iswdigit' is
true. */