Add Euro character.

[kopensolaris-gnu/glibc.git] / malloc / thread-m.h

diff --git a/malloc/thread-m.h b/malloc/thread-m.h
index f9367c6..1598db8 100644 (file)
--- a/malloc/thread-m.h
+++ b/malloc/thread-m.h
@@ -1,6 +1,6 @@
 /* Basic platform-independent macro definitions for mutexes and
    thread-specific data.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>, 1996.
 
@@ -40,20 +40,8 @@ typedef pthread_t thread_id;
 /* mutex */
 typedef pthread_mutex_t        mutex_t;
 
-/* thread specific data */
-typedef void * tsd_key_t;
-
 #define MUTEX_INITIALIZER      PTHREAD_MUTEX_INITIALIZER
 
-#define tsd_key_create(key, destr) ( *(key) = NULL )
-#define tsd_setspecific(key, data) \
-  if (__libc_internal_tsd_set != NULL) {                                     \
-    __libc_internal_tsd_set(_LIBC_TSD_KEY_MALLOC, data);                     \
-  } else { (key) = (Void_t *) data; }
-#define tsd_getspecific(key, vptr) \
-  (vptr = (__libc_internal_tsd_get != NULL                                   \
-          ? __libc_internal_tsd_get(_LIBC_TSD_KEY_MALLOC) : (key)))
-
 #define mutex_init(m)          \
    (__pthread_mutex_init != NULL ? __pthread_mutex_init (m, NULL) : 0)
 #define mutex_lock(m)          \
@@ -74,6 +62,9 @@ typedef void * tsd_key_t;
 #undef mutex_t
 #define mutex_t struct mutex
 
+#undef mutex_init
+#define mutex_init(m) (__mutex_init(m), 0)
+
 #undef mutex_lock
 #define mutex_lock(m) (__mutex_lock(m), 0)
 
@@ -82,20 +73,6 @@ typedef void * tsd_key_t;
 
 #define mutex_trylock(m) (!__mutex_trylock(m))
 
-#include <hurd/threadvar.h>
-
-/* thread specific data */
-typedef int tsd_key_t;
-
-static int tsd_keys_alloced = 0;
-
-#define tsd_key_create(key, destr) \
-  (assert (tsd_keys_alloced == 0), tsd_keys_alloced++)
-#define tsd_setspecific(key, data) \
-  (*__hurd_threadvar_location (_HURD_THREADVAR_MALLOC) = (unsigned long)(data))
-#define tsd_getspecific(key, vptr) \
-  ((vptr) = (void *)*__hurd_threadvar_location (_HURD_THREADVAR_MALLOC))
-
 #define thread_atfork(prepare, parent, child) do {} while(0)
 #define thread_atfork_static(prepare, parent, child) \
  text_set_element(_hurd_fork_prepare_hook, prepare); \
@@ -111,6 +88,20 @@ static int tsd_keys_alloced = 0;
 
 #endif /* MUTEX_INITIALIZER && PTHREAD_MUTEX_INITIALIZER */
 
+#ifndef NO_THREADS
+
+/* thread specific data for glibc */
+
+#include <bits/libc-tsd.h>
+
+typedef int tsd_key_t[0];      /* no key data structure, libc magic does it */
+__libc_tsd_define (, MALLOC)   /* declaration/common definition */
+#define tsd_key_create(key, destr)     ((void) (key))
+#define tsd_setspecific(key, data)     __libc_tsd_set (MALLOC, (data))
+#define tsd_getspecific(key, vptr)     ((vptr) = __libc_tsd_get (MALLOC))
+
+#endif
+
 #elif defined(USE_PTHREADS) /* Posix threads */
 
 #include <pthread.h>