mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 22:40:05 +00:00
f0be25b633
xlocale.h is already a single-type micro-header, defining struct
__locale_struct and the typedefs __locale_t and locale_t. This patch
brings it into the bits/types/ scheme: there are now
bits/types/__locale_t.h which defines only __locale_struct and
__locale_t, and bits/types/locale_t.h which defines locale_t as well
as the other two. None of *our* headers need __locale_t.h, but it
appears to me that libstdc++ could make use of it.
There are a lot of external uses of xlocale.h, but all the uses I
checked had an autoconf test or equivalent for its existence. It has
never been available from other C libraries, and it has always
contained a comment reading "This file is not standardized, don't rely
on it, it can go away without warning" so I think dropping it is
pretty safe.
I also took the opportunity to clean up comments in various public
header files that still talk about the *_l interfaces as though they
were completely nonstandard. There are a few of them, notably the
strtoX_l and wcstoX_l families, that haven't been standardized, but
the bulk are in POSIX.1-2008.
* locale/xlocale.h: Rename to...
* locale/bits/types/__locale_t.h: ...here. Adjust commentary.
Only define struct __locale_struct and __locale_t, not locale_t.
* locale/bits/types/locale_t.h: New file; define locale_t here.
* locale/Makefile (headers): Update to match.
* include/xlocale.h: Delete wrapper.
* include/bits/types/__locale_t.h: New wrapper.
* include/bits/types/locale_t.h: New wrapper.
* ctype/ctype.h, include/printf.h, include/time.h
* locale/langinfo.h, locale/locale.h, stdlib/monetary.h
* stdlib/stdlib.h, string/string.h, string/strings.h, time/time.h
* wcsmbs/wchar.h, wctype/wctype.h: Use bits/types/locale_t.h.
Correct outdated comments regarding the standardization status of
the functions that take locale_t arguments.
* stdlib/strtod_l.c, stdlib/strtof_l.c, stdlib/strtol_l.c
* stdlib/strtold_l.c, stdlib/strtoul_l.c, stdlib/strtoull_l.c
* sysdeps/ieee754/ldbl-128ibm/strtold_l.c
* sysdeps/ieee754/ldbl-64-128/strtold_l.c
* wcsmbs/wcstod.c, wcsmbs/wcstod_l.c, wcsmbs/wcstof.c
* wcsmbs/wcstof_l.c, wcsmbs/wcstold.c, wcsmbs/wcstold_l.c:
Don't include xlocale.h. If necessary, include locale.h instead.
* stdlib/strtold_l.c: Unconditionally include wchar.h.
60 lines
2.1 KiB
C
60 lines
2.1 KiB
C
/* Copyright (C) 1999-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
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/>. */
|
|
|
|
#include <math.h>
|
|
#include <stdlib.h>
|
|
#include <wchar.h>
|
|
|
|
/* The actual implementation for all floating point sizes is in strtod.c.
|
|
These macros tell it to produce the `long double' version, `strtold'. */
|
|
|
|
#define FLOAT long double
|
|
#define FLT LDBL
|
|
#ifdef USE_WIDE_CHAR
|
|
extern long double ____new_wcstold_l (const wchar_t *, wchar_t **, __locale_t);
|
|
# define STRTOF __new_wcstold_l
|
|
# define __STRTOF ____new_wcstold_l
|
|
# define ____STRTOF_INTERNAL ____wcstold_l_internal
|
|
# define STRTOF_NAN __wcstold_nan
|
|
#else
|
|
extern long double ____new_strtold_l (const char *, char **, __locale_t);
|
|
# define STRTOF __new_strtold_l
|
|
# define __STRTOF ____new_strtold_l
|
|
# define ____STRTOF_INTERNAL ____strtold_l_internal
|
|
# define STRTOF_NAN __strtold_nan
|
|
#endif
|
|
extern __typeof (__STRTOF) STRTOF;
|
|
libc_hidden_proto (__STRTOF)
|
|
libc_hidden_proto (STRTOF)
|
|
#define MPN2FLOAT __mpn_construct_long_double
|
|
#define FLOAT_HUGE_VAL HUGE_VALL
|
|
|
|
#include <strtod_l.c>
|
|
|
|
#ifdef __LONG_DOUBLE_MATH_OPTIONAL
|
|
# include <math_ldbl_opt.h>
|
|
# ifdef USE_WIDE_CHAR
|
|
weak_alias (____new_wcstold_l, ___new_wcstold_l);
|
|
long_double_symbol (libc, ___new_wcstold_l, wcstold_l);
|
|
long_double_symbol (libc, ____new_wcstold_l, __wcstold_l);
|
|
# else
|
|
weak_alias (____new_strtold_l, ___new_strtold_l);
|
|
long_double_symbol (libc, ___new_strtold_l, strtold_l);
|
|
long_double_symbol (libc, ____new_strtold_l, __strtold_l);
|
|
# endif
|
|
#endif
|