diff options
author | Zack Weinberg <zackw@panix.com> | 2017-06-20 09:26:43 -0400 |
---|---|---|
committer | Zack Weinberg <zackw@panix.com> | 2017-06-20 20:30:06 -0400 |
commit | af85385f311c574590381f7897461643f8a2fe6f (patch) | |
tree | b1cd7d3f16a4e66a60db7fd714b6cb9823fbdc35 /sysdeps/ieee754 | |
parent | f0be25b6336db7492e47d2e8e72eb8af53b5506d (diff) | |
download | glibc-af85385f311c574590381f7897461643f8a2fe6f.tar.gz glibc-af85385f311c574590381f7897461643f8a2fe6f.tar.xz glibc-af85385f311c574590381f7897461643f8a2fe6f.zip |
Use locale_t, not __locale_t, throughout glibc
<locale.h> is specified to define locale_t in POSIX.1-2008, and so are all of the headers that define functions that take locale_t arguments. Under _GNU_SOURCE, the additional headers that define such functions have also always defined locale_t. Therefore, there is no need to use __locale_t in public function prototypes, nor in any internal code. * ctype/ctype-c99_l.c, ctype/ctype.h, ctype/ctype_l.c * include/monetary.h, include/stdlib.h, include/time.h * include/wchar.h, locale/duplocale.c, locale/freelocale.c * locale/global-locale.c, locale/langinfo.h, locale/locale.h * locale/localeinfo.h, locale/newlocale.c * locale/nl_langinfo_l.c, locale/uselocale.c * localedata/bug-usesetlocale.c, localedata/tst-xlocale2.c * stdio-common/vfscanf.c, stdlib/monetary.h, stdlib/stdlib.h * stdlib/strfmon_l.c, stdlib/strtod_l.c, stdlib/strtof_l.c * stdlib/strtol.c, stdlib/strtol_l.c, stdlib/strtold_l.c * stdlib/strtoll_l.c, stdlib/strtoul_l.c, stdlib/strtoull_l.c * string/strcasecmp.c, string/strcoll_l.c, string/string.h * string/strings.h, string/strncase.c, string/strxfrm_l.c * sysdeps/ieee754/float128/strtof128_l.c * sysdeps/ieee754/float128/wcstof128.c * sysdeps/ieee754/float128/wcstof128_l.c * sysdeps/ieee754/ldbl-128ibm/strtold_l.c * sysdeps/ieee754/ldbl-64-128/strtold_l.c * sysdeps/ieee754/ldbl-opt/nldbl-compat.c * sysdeps/ieee754/ldbl-opt/nldbl-strfmon_l.c * sysdeps/ieee754/ldbl-opt/nldbl-strtold_l.c * sysdeps/ieee754/ldbl-opt/nldbl-wcstold_l.c * sysdeps/powerpc/powerpc32/power7/strcasecmp.S * sysdeps/powerpc/powerpc64/power7/strcasecmp.S * sysdeps/x86_64/strcasecmp_l-nonascii.c * sysdeps/x86_64/strncase_l-nonascii.c, time/strftime_l.c * time/strptime_l.c, time/time.h, wcsmbs/mbsrtowcs_l.c * wcsmbs/wchar.h, wcsmbs/wcscasecmp.c, wcsmbs/wcsncase.c * wcsmbs/wcstod.c, wcsmbs/wcstod_l.c, wcsmbs/wcstof.c * wcsmbs/wcstof_l.c, wcsmbs/wcstol_l.c, wcsmbs/wcstold.c * wcsmbs/wcstold_l.c, wcsmbs/wcstoll_l.c, wcsmbs/wcstoul_l.c * wcsmbs/wcstoull_l.c, wctype/iswctype_l.c * wctype/towctrans_l.c, wctype/wcfuncs_l.c * wctype/wctrans_l.c, wctype/wctype.h, wctype/wctype_l.c: Change all uses of __locale_t to locale_t.
Diffstat (limited to 'sysdeps/ieee754')
-rw-r--r-- | sysdeps/ieee754/float128/strtof128_l.c | 2 | ||||
-rw-r--r-- | sysdeps/ieee754/float128/wcstof128.c | 2 | ||||
-rw-r--r-- | sysdeps/ieee754/float128/wcstof128_l.c | 2 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-128ibm/strtold_l.c | 4 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-64-128/strtold_l.c | 4 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-opt/nldbl-compat.c | 4 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-opt/nldbl-strfmon_l.c | 2 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-opt/nldbl-strtold_l.c | 4 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-opt/nldbl-wcstold_l.c | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/sysdeps/ieee754/float128/strtof128_l.c b/sysdeps/ieee754/float128/strtof128_l.c index 0f768a30de..d3d55ea9fa 100644 --- a/sysdeps/ieee754/float128/strtof128_l.c +++ b/sysdeps/ieee754/float128/strtof128_l.c @@ -22,7 +22,7 @@ #include <bits/floatn.h> extern _Float128 ____strtof128_l_internal (const char *, char **, - int, __locale_t); + int, locale_t); #define FLOAT _Float128 #define FLT FLT128 diff --git a/sysdeps/ieee754/float128/wcstof128.c b/sysdeps/ieee754/float128/wcstof128.c index c5a17baadf..1d6326d910 100644 --- a/sysdeps/ieee754/float128/wcstof128.c +++ b/sysdeps/ieee754/float128/wcstof128.c @@ -25,6 +25,6 @@ #include <bits/floatn.h> extern _Float128 ____wcstof128_l_internal (const wchar_t *, wchar_t **, int, - __locale_t); + locale_t); #include "strtof128.c" diff --git a/sysdeps/ieee754/float128/wcstof128_l.c b/sysdeps/ieee754/float128/wcstof128_l.c index 670b6af0da..2df71848ec 100644 --- a/sysdeps/ieee754/float128/wcstof128_l.c +++ b/sysdeps/ieee754/float128/wcstof128_l.c @@ -25,6 +25,6 @@ #include <bits/floatn.h> extern _Float128 ____wcstof128_l_internal (const wchar_t *, wchar_t **, int, - __locale_t); + locale_t); #include "strtof128_l.c" diff --git a/sysdeps/ieee754/ldbl-128ibm/strtold_l.c b/sysdeps/ieee754/ldbl-128ibm/strtold_l.c index 341de78063..b12151d579 100644 --- a/sysdeps/ieee754/ldbl-128ibm/strtold_l.c +++ b/sysdeps/ieee754/ldbl-128ibm/strtold_l.c @@ -25,13 +25,13 @@ #define FLOAT long double #define FLT LDBL #ifdef USE_WIDE_CHAR -extern long double ____new_wcstold_l (const wchar_t *, wchar_t **, __locale_t); +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); +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 diff --git a/sysdeps/ieee754/ldbl-64-128/strtold_l.c b/sysdeps/ieee754/ldbl-64-128/strtold_l.c index 341de78063..b12151d579 100644 --- a/sysdeps/ieee754/ldbl-64-128/strtold_l.c +++ b/sysdeps/ieee754/ldbl-64-128/strtold_l.c @@ -25,13 +25,13 @@ #define FLOAT long double #define FLT LDBL #ifdef USE_WIDE_CHAR -extern long double ____new_wcstold_l (const wchar_t *, wchar_t **, __locale_t); +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); +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 diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-compat.c b/sysdeps/ieee754/ldbl-opt/nldbl-compat.c index 84c4aeeed9..e11d6d1bd0 100644 --- a/sysdeps/ieee754/ldbl-opt/nldbl-compat.c +++ b/sysdeps/ieee754/ldbl-opt/nldbl-compat.c @@ -790,7 +790,7 @@ __nldbl_strfmon (char *s, size_t maxsize, const char *format, ...) ssize_t attribute_compat_text_section -__nldbl___strfmon_l (char *s, size_t maxsize, __locale_t loc, +__nldbl___strfmon_l (char *s, size_t maxsize, locale_t loc, const char *format, ...) { va_list ap; @@ -818,7 +818,7 @@ libc_hidden_def (__nldbl___vstrfmon) ssize_t attribute_compat_text_section -__nldbl___vstrfmon_l (char *s, size_t maxsize, __locale_t loc, +__nldbl___vstrfmon_l (char *s, size_t maxsize, locale_t loc, const char *format, va_list ap) { ssize_t res; diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-strfmon_l.c b/sysdeps/ieee754/ldbl-opt/nldbl-strfmon_l.c index 0db0e8c42f..9281e17a37 100644 --- a/sysdeps/ieee754/ldbl-opt/nldbl-strfmon_l.c +++ b/sysdeps/ieee754/ldbl-opt/nldbl-strfmon_l.c @@ -2,7 +2,7 @@ ssize_t attribute_hidden -__strfmon_l (char *s, size_t maxsize, __locale_t loc, const char *format, ...) +__strfmon_l (char *s, size_t maxsize, locale_t loc, const char *format, ...) { va_list ap; ssize_t res; diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-strtold_l.c b/sysdeps/ieee754/ldbl-opt/nldbl-strtold_l.c index 33ff1ca5b5..29ad60c8a5 100644 --- a/sysdeps/ieee754/ldbl-opt/nldbl-strtold_l.c +++ b/sysdeps/ieee754/ldbl-opt/nldbl-strtold_l.c @@ -8,11 +8,11 @@ extern double __strtod_l (const char *__restrict __nptr, char **__restrict __endptr, - __locale_t __loc); + locale_t __loc); double attribute_hidden -__strtold_l (const char *nptr, char **endptr, __locale_t loc) +__strtold_l (const char *nptr, char **endptr, locale_t loc) { return __strtod_l (nptr, endptr, loc); } diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-wcstold_l.c b/sysdeps/ieee754/ldbl-opt/nldbl-wcstold_l.c index e32d13a94b..7004ae79f4 100644 --- a/sysdeps/ieee754/ldbl-opt/nldbl-wcstold_l.c +++ b/sysdeps/ieee754/ldbl-opt/nldbl-wcstold_l.c @@ -6,7 +6,7 @@ double attribute_hidden -__wcstold_l (const wchar_t *nptr, wchar_t **endptr, __locale_t loc) +__wcstold_l (const wchar_t *nptr, wchar_t **endptr, locale_t loc) { return __wcstod_l (nptr, endptr, loc); } |