[Glibc-bsd-commits] r3214 - trunk/glibc-ports/kfreebsd/linuxthreads/bits

[Robert Millan]

Author: rmh
Date: 2010-12-28 13:41:18 +0000 (Tue, 28 Dec 2010)
New Revision: 3214

Modified:
   trunk/glibc-ports/kfreebsd/linuxthreads/bits/libc-tsd.h
Log:
Fix bitrot in libc-tsd.h (exposed by --without-__thread)

Modified: trunk/glibc-ports/kfreebsd/linuxthreads/bits/libc-tsd.h
===================================================================
--- trunk/glibc-ports/kfreebsd/linuxthreads/bits/libc-tsd.h	2010-12-28 13:40:10 UTC (rev 3213)
+++ trunk/glibc-ports/kfreebsd/linuxthreads/bits/libc-tsd.h	2010-12-28 13:41:18 UTC (rev 3214)
@@ -42,14 +42,14 @@
 weak_extern (__pthread_internal_tsd_set)
 # endif
 
-#define __libc_tsd_define(CLASS, KEY)	CLASS void *__libc_tsd_##KEY##_data;
-#define __libc_tsd_address(KEY) \
-  __libc_maybe_call2 (pthread_internal_tsd_address,			\
+#define __libc_tsd_define(CLASS, TYPE, KEY)	CLASS TYPE __libc_tsd_##KEY##_data;
+#define __libc_tsd_address(TYPE, KEY) \
+  (TYPE *) __libc_maybe_call2 (pthread_internal_tsd_address,			\
 		      (_LIBC_TSD_KEY_##KEY), &__libc_tsd_##KEY##_data)
-#define __libc_tsd_get(KEY) \
-  __libc_maybe_call2 (pthread_internal_tsd_get,				\
+#define __libc_tsd_get(TYPE, KEY) \
+  (TYPE) __libc_maybe_call2 (pthread_internal_tsd_get,				\
 		      (_LIBC_TSD_KEY_##KEY), __libc_tsd_##KEY##_data)
-#define __libc_tsd_set(KEY, VALUE) \
+#define __libc_tsd_set(TYPE, KEY, VALUE) \
   __libc_maybe_call2 (pthread_internal_tsd_set,				\
 		      (_LIBC_TSD_KEY_##KEY, (VALUE)),			\
 		       (__libc_tsd_##KEY##_data = (VALUE), 0))