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 /include | |
parent | f0be25b6336db7492e47d2e8e72eb8af53b5506d (diff) | |
download | glibc-af85385f311c574590381f7897461643f8a2fe6f.tar glibc-af85385f311c574590381f7897461643f8a2fe6f.tar.gz glibc-af85385f311c574590381f7897461643f8a2fe6f.tar.bz2 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 'include')
-rw-r--r-- | include/monetary.h | 2 | ||||
-rw-r--r-- | include/stdlib.h | 16 | ||||
-rw-r--r-- | include/time.h | 2 | ||||
-rw-r--r-- | include/wchar.h | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/include/monetary.h b/include/monetary.h index e6870138f8..2a182636d2 100644 --- a/include/monetary.h +++ b/include/monetary.h @@ -2,6 +2,6 @@ #ifndef _ISOMAC #include <stdarg.h> -extern ssize_t __vstrfmon_l (char *s, size_t maxsize, __locale_t loc, +extern ssize_t __vstrfmon_l (char *s, size_t maxsize, locale_t loc, const char *format, va_list ap); #endif diff --git a/include/stdlib.h b/include/stdlib.h index cae9f2c541..6fd868828b 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -156,34 +156,34 @@ libc_hidden_proto (__strtoull_internal) extern double ____strtod_l_internal (const char *__restrict __nptr, char **__restrict __endptr, int __group, - __locale_t __loc); + locale_t __loc); extern float ____strtof_l_internal (const char *__restrict __nptr, char **__restrict __endptr, int __group, - __locale_t __loc); + locale_t __loc); extern long double ____strtold_l_internal (const char *__restrict __nptr, char **__restrict __endptr, - int __group, __locale_t __loc); + int __group, locale_t __loc); extern long int ____strtol_l_internal (const char *__restrict __nptr, char **__restrict __endptr, int __base, int __group, - __locale_t __loc); + locale_t __loc); extern unsigned long int ____strtoul_l_internal (const char * __restrict __nptr, char **__restrict __endptr, int __base, int __group, - __locale_t __loc); + locale_t __loc); __extension__ extern long long int ____strtoll_l_internal (const char *__restrict __nptr, char **__restrict __endptr, int __base, int __group, - __locale_t __loc); + locale_t __loc); __extension__ extern unsigned long long int ____strtoull_l_internal (const char * __restrict __nptr, char ** __restrict __endptr, int __base, int __group, - __locale_t __loc); + locale_t __loc); libc_hidden_proto (____strtof_l_internal) libc_hidden_proto (____strtod_l_internal) @@ -243,7 +243,7 @@ libc_hidden_proto (__strtof128_internal) extern _Float128 ____strtof128_l_internal (const char *__restrict __nptr, char **__restrict __endptr, - int __group, __locale_t __loc); + int __group, locale_t __loc); libc_hidden_proto (____strtof128_l_internal) #endif diff --git a/include/time.h b/include/time.h index 0a67cf3a19..7eb0fa72d9 100644 --- a/include/time.h +++ b/include/time.h @@ -92,7 +92,7 @@ extern int __getclktck (void); /* strptime support. */ extern char * __strptime_internal (const char *rp, const char *fmt, struct tm *tm, void *statep, - __locale_t locparam) + locale_t locparam) internal_function; extern double __difftime (time_t time1, time_t time0); diff --git a/include/wchar.h b/include/wchar.h index b7b5a5c43d..7bf042c235 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -54,7 +54,7 @@ extern unsigned long long int __wcstoull_internal (const wchar_t * int __group) __THROW; extern unsigned long long int ____wcstoull_l_internal (const wchar_t *, wchar_t **, int, int, - __locale_t); + locale_t); libc_hidden_proto (__wcstof_internal) libc_hidden_proto (__wcstod_internal) libc_hidden_proto (__wcstold_internal) @@ -221,7 +221,7 @@ libc_hidden_proto (__isoc99_vfwscanf) /* Internal functions. */ extern size_t __mbsrtowcs_l (wchar_t *dst, const char **src, size_t len, - mbstate_t *ps, __locale_t l) attribute_hidden; + mbstate_t *ps, locale_t l) attribute_hidden; /* Special version. We know that all uses of mbsinit inside the libc have a non-NULL parameter. And certainly we can access the |