summaryrefslogtreecommitdiff
path: root/locale/global-locale.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-30 01:51:11 +0000
committerRoland McGrath <roland@gnu.org>2002-08-30 01:51:11 +0000
commitcc13edc8d4351bb96bb2e0d785284ec089705cfa (patch)
tree189d5223b8c3cfc8ded13ee906a3515d8d2406d0 /locale/global-locale.c
parent7a9ce79a3b0746e0db7d3cc4264a78a9d79620a3 (diff)
downloadglibc-cc13edc8d4351bb96bb2e0d785284ec089705cfa.tar.gz
* sysdeps/mach/hurd/i386/init-first.c (_hurd_stack_setup: doinit):
Change argument type from int to intptr_t. * locale/global-locale.c (__libc_tsd_LOCALE_data): Conditionalize the initializer on [! _HURD_THREADVAR_H] (bad kludge). * sysdeps/mach/hurd/i386/init-first.c (init): Initialize _HURD_THREADVAR_LOCALE slot to &_nl_global_locale. * hurd/hurdsig.c (_hurdsig_init): Likewise. Zero other slots.
Diffstat (limited to 'locale/global-locale.c')
-rw-r--r--locale/global-locale.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/locale/global-locale.c b/locale/global-locale.c
index 70f10ab5ae..bec7498dae 100644
--- a/locale/global-locale.c
+++ b/locale/global-locale.c
@@ -58,6 +58,10 @@ __thread void *__libc_tsd_LOCALE = &_nl_global_locale;
#else
__libc_tsd_define (, LOCALE)
/* This is a bad kludge presuming the variable name used by the macros.
- Using typeof makes sure to barf if we do not match the macro definition. */
+ Using typeof makes sure to barf if we do not match the macro definition.
+ This ifndef is a further bad kludge for Hurd, where there is an explicit
+ initialization. */
+# ifndef _HURD_THREADVAR_H
__typeof (__libc_tsd_LOCALE_data) __libc_tsd_LOCALE_data = &_nl_global_locale;
+# endif
#endif