diff options
| author | kamil <kamil@NetBSD.org> | 2020-02-01 15:39:56 +0000 |
|---|---|---|
| committer | kamil <kamil@NetBSD.org> | 2020-02-01 15:39:56 +0000 |
| commit | 296cac0517b738674adfd124ee577daa7d2ccc66 (patch) | |
| tree | 158d1c8fd8b21c84c9e54f1007210982861a404b /lib/libpthread | |
| parent | 292126dbcd0afa15a7810941d07e43238f3b00e7 (diff) | |
Remove 'ifdef 0' hacks
It is no longer needed as the proper fix avoiding premature malloc()
landed the sources.
Diffstat (limited to 'lib/libpthread')
| -rw-r--r-- | lib/libpthread/pthread_mutex.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/libpthread/pthread_mutex.c b/lib/libpthread/pthread_mutex.c index b76366c509c..12f501ff661 100644 --- a/lib/libpthread/pthread_mutex.c +++ b/lib/libpthread/pthread_mutex.c @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_mutex.c,v 1.72 2020/01/31 17:52:14 kamil Exp $ */ +/* $NetBSD: pthread_mutex.c,v 1.73 2020/02/01 15:39:56 kamil Exp $ */ /*- * Copyright (c) 2001, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: pthread_mutex.c,v 1.72 2020/01/31 17:52:14 kamil Exp $"); +__RCSID("$NetBSD: pthread_mutex.c,v 1.73 2020/02/01 15:39:56 kamil Exp $"); #include <sys/types.h> #include <sys/lwpctl.h> @@ -122,14 +122,12 @@ pthread_mutex_init(pthread_mutex_t *ptm, const pthread_mutexattr_t *attr) { uintptr_t type, proto, val, ceil; -#if 0 /* * Always initialize the mutex structure, maybe be used later * and the cost should be minimal. */ if (__predict_false(__uselibcstub)) return __libc_mutex_init_stub(ptm, attr); -#endif pthread__error(EINVAL, "Invalid mutes attribute", attr == NULL || attr->ptma_magic == _PT_MUTEXATTR_MAGIC); @@ -619,10 +617,9 @@ pthread__mutex_wakeup(pthread_t self, pthread_mutex_t *ptm) int pthread_mutexattr_init(pthread_mutexattr_t *attr) { -#if 0 + if (__predict_false(__uselibcstub)) return __libc_mutexattr_init_stub(attr); -#endif attr->ptma_magic = _PT_MUTEXATTR_MAGIC; attr->ptma_private = (void *)PTHREAD_MUTEX_DEFAULT; |
