diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:31:37 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:31:37 +0000 |
| commit | 74a412373b66a38b6ce8156f027ce26f89a7462f (patch) | |
| tree | a59ce0af7ffd48641ca9124d697f7a6b57b26931 /locale/global-locale.c | |
| parent | 2004eeba8fb2a92105bbf95b280fff6dc1d84144 (diff) | |
| parent | 4cbfda396f7cd9e83116c28965ade73d80c1cb82 (diff) | |
Merge commit 'refs/top-bases/t/ONSTACK' into t/ONSTACK
Diffstat (limited to 'locale/global-locale.c')
| -rw-r--r-- | locale/global-locale.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/locale/global-locale.c b/locale/global-locale.c index a83e463070..6cdc41f527 100644 --- a/locale/global-locale.c +++ b/locale/global-locale.c @@ -1,5 +1,5 @@ /* Locale object representing the global locale controlled by setlocale. - Copyright (C) 2002-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -61,4 +61,4 @@ struct __locale_struct _nl_global_locale attribute_hidden = #include <tls.h> /* The tsd macros don't permit an initializer. */ -__thread __locale_t __libc_tsd_LOCALE = &_nl_global_locale; +__thread locale_t __libc_tsd_LOCALE = &_nl_global_locale; |