diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:36:51 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:36:51 +0000 |
| commit | 05fa8834c6644f12405ea713c48693bf2d1864f1 (patch) | |
| tree | c6b6391884370c75972a2e432d42ebbb076a0cdf /locale/newlocale.c | |
| parent | 525c181a5a9a95e24d2111b7792608151a40eb84 (diff) | |
| parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) | |
Merge commit 'refs/top-bases/t/bigmem' into t/bigmemt/bigmem
Diffstat (limited to 'locale/newlocale.c')
| -rw-r--r-- | locale/newlocale.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/locale/newlocale.c b/locale/newlocale.c index 3deecc42df..2737a4fc22 100644 --- a/locale/newlocale.c +++ b/locale/newlocale.c @@ -1,5 +1,5 @@ /* Return a reference to locale information record. - Copyright (C) 1996-2016 Free Software Foundation, Inc. + Copyright (C) 1996-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -39,13 +39,13 @@ __libc_rwlock_define (extern , __libc_setlocale_lock attribute_hidden) } while (0) -__locale_t -__newlocale (int category_mask, const char *locale, __locale_t base) +locale_t +__newlocale (int category_mask, const char *locale, locale_t base) { /* Intermediate memory for result. */ const char *newnames[__LC_LAST]; struct __locale_struct result; - __locale_t result_ptr; + locale_t result_ptr; char *locale_path; size_t locale_path_len; const char *locpath_var; @@ -86,7 +86,7 @@ __newlocale (int category_mask, const char *locale, __locale_t base) dataset using the C locale data. */ if (category_mask == 0) { - result_ptr = (__locale_t) malloc (sizeof (struct __locale_struct)); + result_ptr = (locale_t) malloc (sizeof (struct __locale_struct)); if (result_ptr == NULL) return NULL; *result_ptr = result; |