diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 18:56:13 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 18:57:13 +0000 |
commit | 82dd75a7f436a19047325d62182590c9f9e23a78 (patch) | |
tree | 60ca20c8cf2b0d178d84725c0715471f76df97e1 /locale/duplocale.c | |
parent | 0bbb676a2342367c4e52b35e890f24667dabb348 (diff) | |
parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) |
Merge commit 'refs/top-bases/t/tls' into t/tls
Diffstat (limited to 'locale/duplocale.c')
-rw-r--r-- | locale/duplocale.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/locale/duplocale.c b/locale/duplocale.c index bd8a191569..9965042fcd 100644 --- a/locale/duplocale.c +++ b/locale/duplocale.c @@ -1,5 +1,5 @@ /* Duplicate handle for selection of locales. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -29,8 +29,8 @@ __libc_rwlock_define (extern , __libc_setlocale_lock attribute_hidden) -__locale_t -__duplocale (__locale_t dataset) +locale_t +__duplocale (locale_t dataset) { /* This static object is returned for newlocale (LC_ALL_MASK, "C"). */ if (dataset == _nl_C_locobj_ptr) @@ -40,7 +40,7 @@ __duplocale (__locale_t dataset) if (dataset == LC_GLOBAL_LOCALE) dataset = &_nl_global_locale; - __locale_t result; + locale_t result; int cnt; size_t names_len = 0; |