From cc13edc8d4351bb96bb2e0d785284ec089705cfa Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 30 Aug 2002 01:51:11 +0000 Subject: * 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. --- locale/global-locale.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'locale') diff --git a/locale/global-locale.c b/locale/global-locale.c index 70f10ab..bec7498 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 -- cgit v1.1