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 /time | |
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 'time')
-rw-r--r-- | time/strftime_l.c | 2 | ||||
-rw-r--r-- | time/strptime_l.c | 2 | ||||
-rw-r--r-- | time/time.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/time/strftime_l.c b/time/strftime_l.c index eb3efb8129..439b971747 100644 --- a/time/strftime_l.c +++ b/time/strftime_l.c @@ -284,7 +284,7 @@ static const CHAR_T zeroes[16] = /* "0000000000000000" */ # undef _NL_CURRENT # define _NL_CURRENT(category, item) \ (current->values[_NL_ITEM_INDEX (item)].string) -# define LOCALE_PARAM , __locale_t loc +# define LOCALE_PARAM , locale_t loc # define LOCALE_ARG , loc # define HELPER_LOCALE_ARG , current #else diff --git a/time/strptime_l.c b/time/strptime_l.c index dbf4606982..185619e142 100644 --- a/time/strptime_l.c +++ b/time/strptime_l.c @@ -181,7 +181,7 @@ static const unsigned short int __mon_yday[2][13] = # undef _NL_CURRENT_WORD # define _NL_CURRENT_WORD(category, item) \ (current->values[_NL_ITEM_INDEX (item)].word) -# define LOCALE_PARAM , __locale_t locale +# define LOCALE_PARAM , locale_t locale # define LOCALE_ARG , locale # define HELPER_LOCALE_ARG , current # define ISSPACE(Ch) __isspace_l (Ch, locale) diff --git a/time/time.h b/time/time.h index 17cc1e6614..f12a4613fc 100644 --- a/time/time.h +++ b/time/time.h @@ -104,13 +104,13 @@ extern char *strptime (const char *__restrict __s, extern size_t strftime_l (char *__restrict __s, size_t __maxsize, const char *__restrict __format, const struct tm *__restrict __tp, - __locale_t __loc) __THROW; + locale_t __loc) __THROW; #endif #ifdef __USE_GNU extern char *strptime_l (const char *__restrict __s, const char *__restrict __fmt, struct tm *__tp, - __locale_t __loc) __THROW; + locale_t __loc) __THROW; #endif |