diff options
Diffstat (limited to 'malloc/thread-m.h')
| -rw-r--r-- | malloc/thread-m.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/malloc/thread-m.h b/malloc/thread-m.h index 371e49178d..331afc71e8 100644 --- a/malloc/thread-m.h +++ b/malloc/thread-m.h @@ -19,8 +19,8 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* One out of _LIBC, USE_PTHREADS, USE_THR * or USE_SPROC should be - defined, otherwise the token NO_THREADS * and dummy implementations +/* One out of _LIBC, USE_PTHREADS, USE_THR, or USE_SPROC should be + defined, otherwise the token NO_THREADS and dummy implementations of the macros will be defined. */ #ifndef _THREAD_M_H @@ -43,14 +43,11 @@ typedef pthread_key_t tsd_key_t; #define MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER #define tsd_key_create(key, destr) \ - if (__pthread_key_create != NULL) { \ - __pthread_key_create(key, destr); } else { *(key) = (tsd_key_t) 0; } + if (__pthread_key_create != NULL) { __pthread_key_create(key, destr); } #define tsd_setspecific(key, data) \ - if (__pthread_setspecific != NULL) { \ - __pthread_setspecific(key, data); } else { (key) = (tsd_key_t) data; } + if (__pthread_setspecific != NULL) { __pthread_setspecific(key, data); } #define tsd_getspecific(key, vptr) \ - (vptr = (__pthread_getspecific != NULL ? \ - __pthread_getspecific(key) : (tsd_key_t *) (key))) + (vptr = (__pthread_getspecific != NULL ? __pthread_getspecific(key) : NULL)) #define mutex_init(m) \ (__pthread_mutex_init != NULL ? __pthread_mutex_init (m, NULL) : 0) @@ -167,9 +164,9 @@ typedef int mutex_t; #define mutex_unlock(m) (0) typedef void *tsd_key_t; -#define tsd_key_create(key, destr) (*(key) = NULL) -#define tsd_setspecific(key, data) ((key) = data) -#define tsd_getspecific(key, vptr) (vptr = (key)) +#define tsd_key_create(key, destr) do {} while(0) +#define tsd_setspecific(key, data) do {} while(0) +#define tsd_getspecific(key, vptr) (vptr = NULL) #endif /* defined(NO_THREADS) */ |