From 0e5c6fde03afa2d4b478ff3489ba8809526b5b5f Mon Sep 17 00:00:00 2001 From: Philip Guenther Date: Tue, 15 Aug 2017 07:06:30 +0000 Subject: s/DEF_STD/DEF_STRONG/ to match namespace.h differences between librthread and libc --- lib/libc/thread/rthread.c | 8 ++++---- lib/libc/thread/rthread_cond.c | 12 ++++++------ lib/libc/thread/rthread_mutex.c | 10 +++++----- lib/libc/thread/rthread_sync.c | 20 ++++++++++---------- lib/libc/thread/rthread_tls.c | 8 ++++---- 5 files changed, 29 insertions(+), 29 deletions(-) (limited to 'lib/libc') diff --git a/lib/libc/thread/rthread.c b/lib/libc/thread/rthread.c index 7a5645895d2..97947e515df 100644 --- a/lib/libc/thread/rthread.c +++ b/lib/libc/thread/rthread.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread.c,v 1.2 2017/08/15 06:38:41 guenther Exp $ */ +/* $OpenBSD: rthread.c,v 1.3 2017/08/15 07:06:29 guenther Exp $ */ /* * Copyright (c) 2004,2005 Ted Unangst * All Rights Reserved. @@ -270,7 +270,7 @@ pthread_self(void) return (TIB_GET()->tib_thread); } -DEF_STD(pthread_self); +DEF_STRONG(pthread_self); static void _rthread_reaper(void) @@ -348,7 +348,7 @@ pthread_exit(void *retval) __threxit(&tib->tib_tid); for(;;); } -DEF_STD(pthread_exit); +DEF_STRONG(pthread_exit); int pthread_join(pthread_t thread, void **retval) @@ -551,7 +551,7 @@ pthread_setcancelstate(int state, int *oldstatep) return (0); } -DEF_STD(pthread_setcancelstate); +DEF_STRONG(pthread_setcancelstate); int pthread_setcanceltype(int type, int *oldtypep) diff --git a/lib/libc/thread/rthread_cond.c b/lib/libc/thread/rthread_cond.c index 744608d35db..fb69dd2cb0a 100644 --- a/lib/libc/thread/rthread_cond.c +++ b/lib/libc/thread/rthread_cond.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_cond.c,v 1.2 2017/08/15 06:38:41 guenther Exp $ */ +/* $OpenBSD: rthread_cond.c,v 1.3 2017/08/15 07:06:29 guenther Exp $ */ /* * Copyright (c) 2017 Martin Pieuchot * Copyright (c) 2012 Philip Guenther @@ -45,7 +45,7 @@ pthread_cond_init(pthread_cond_t *condp, const pthread_condattr_t *attr) return (0); } -DEF_STD(pthread_cond_init); +DEF_STRONG(pthread_cond_init); int pthread_cond_destroy(pthread_cond_t *condp) @@ -68,7 +68,7 @@ pthread_cond_destroy(pthread_cond_t *condp) return (0); } -DEF_STD(pthread_cond_destroy); +DEF_STRONG(pthread_cond_destroy); int _rthread_cond_timedwait(pthread_cond_t cond, pthread_mutex_t *mutexp, @@ -166,7 +166,7 @@ pthread_cond_wait(pthread_cond_t *condp, pthread_mutex_t *mutexp) cond = *condp; return (_rthread_cond_timedwait(cond, mutexp, NULL)); } -DEF_STD(pthread_cond_wait); +DEF_STRONG(pthread_cond_wait); int pthread_cond_signal(pthread_cond_t *condp) @@ -187,7 +187,7 @@ pthread_cond_signal(pthread_cond_t *condp) return (0); } -DEF_STD(pthread_cond_signal); +DEF_STRONG(pthread_cond_signal); int pthread_cond_broadcast(pthread_cond_t *condp) @@ -212,4 +212,4 @@ pthread_cond_broadcast(pthread_cond_t *condp) return (0); } -DEF_STD(pthread_cond_broadcast); +DEF_STRONG(pthread_cond_broadcast); diff --git a/lib/libc/thread/rthread_mutex.c b/lib/libc/thread/rthread_mutex.c index 6fa168e1c8d..d2ad1f7bebd 100644 --- a/lib/libc/thread/rthread_mutex.c +++ b/lib/libc/thread/rthread_mutex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_mutex.c,v 1.2 2017/08/15 06:38:41 guenther Exp $ */ +/* $OpenBSD: rthread_mutex.c,v 1.3 2017/08/15 07:06:29 guenther Exp $ */ /* * Copyright (c) 2017 Martin Pieuchot * Copyright (c) 2012 Philip Guenther @@ -67,7 +67,7 @@ pthread_mutex_init(pthread_mutex_t *mutexp, const pthread_mutexattr_t *attr) return (0); } -DEF_STD(pthread_mutex_init); +DEF_STRONG(pthread_mutex_init); int pthread_mutex_destroy(pthread_mutex_t *mutexp) @@ -91,7 +91,7 @@ pthread_mutex_destroy(pthread_mutex_t *mutexp) return (0); } -DEF_STD(pthread_mutex_destroy); +DEF_STRONG(pthread_mutex_destroy); static int _rthread_mutex_trylock(pthread_mutex_t mutex, int trywait, @@ -222,7 +222,7 @@ pthread_mutex_lock(pthread_mutex_t *mutexp) { return (_rthread_mutex_timedlock(mutexp, 0, NULL, 0)); } -DEF_STD(pthread_mutex_lock); +DEF_STRONG(pthread_mutex_lock); int pthread_mutex_unlock(pthread_mutex_t *mutexp) @@ -284,4 +284,4 @@ pthread_mutex_unlock(pthread_mutex_t *mutexp) return (0); } -DEF_STD(pthread_mutex_unlock); +DEF_STRONG(pthread_mutex_unlock); diff --git a/lib/libc/thread/rthread_sync.c b/lib/libc/thread/rthread_sync.c index 47379156571..6f6bda4e6a4 100644 --- a/lib/libc/thread/rthread_sync.c +++ b/lib/libc/thread/rthread_sync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_sync.c,v 1.2 2017/08/15 06:38:41 guenther Exp $ */ +/* $OpenBSD: rthread_sync.c,v 1.3 2017/08/15 07:06:29 guenther Exp $ */ /* * Copyright (c) 2004,2005 Ted Unangst * Copyright (c) 2012 Philip Guenther @@ -57,7 +57,7 @@ pthread_mutex_init(pthread_mutex_t *mutexp, const pthread_mutexattr_t *attr) return (0); } -DEF_STD(pthread_mutex_init); +DEF_STRONG(pthread_mutex_init); int pthread_mutex_destroy(pthread_mutex_t *mutexp) @@ -79,7 +79,7 @@ pthread_mutex_destroy(pthread_mutex_t *mutexp) } return (0); } -DEF_STD(pthread_mutex_destroy); +DEF_STRONG(pthread_mutex_destroy); static int _rthread_mutex_lock(pthread_mutex_t *mutexp, int trywait, @@ -170,7 +170,7 @@ pthread_mutex_lock(pthread_mutex_t *p) { return (_rthread_mutex_lock(p, 0, NULL)); } -DEF_STD(pthread_mutex_lock); +DEF_STRONG(pthread_mutex_lock); int pthread_mutex_trylock(pthread_mutex_t *p) @@ -235,7 +235,7 @@ pthread_mutex_unlock(pthread_mutex_t *mutexp) return (0); } -DEF_STD(pthread_mutex_unlock); +DEF_STRONG(pthread_mutex_unlock); /* * condition variables @@ -258,7 +258,7 @@ pthread_cond_init(pthread_cond_t *condp, const pthread_condattr_t *attr) return (0); } -DEF_STD(pthread_cond_init); +DEF_STRONG(pthread_cond_init); int pthread_cond_destroy(pthread_cond_t *condp) @@ -280,7 +280,7 @@ pthread_cond_destroy(pthread_cond_t *condp) return (0); } -DEF_STD(pthread_cond_destroy); +DEF_STRONG(pthread_cond_destroy); int pthread_cond_timedwait(pthread_cond_t *condp, pthread_mutex_t *mutexp, @@ -573,7 +573,7 @@ pthread_cond_wait(pthread_cond_t *condp, pthread_mutex_t *mutexp) return (0); } -DEF_STD(pthread_cond_wait); +DEF_STRONG(pthread_cond_wait); int @@ -623,7 +623,7 @@ pthread_cond_signal(pthread_cond_t *condp) return (0); } -DEF_STD(pthread_cond_signal); +DEF_STRONG(pthread_cond_signal); int pthread_cond_broadcast(pthread_cond_t *condp) @@ -689,4 +689,4 @@ pthread_cond_broadcast(pthread_cond_t *condp) return (0); } -DEF_STD(pthread_cond_broadcast); +DEF_STRONG(pthread_cond_broadcast); diff --git a/lib/libc/thread/rthread_tls.c b/lib/libc/thread/rthread_tls.c index 9178e662291..ba92ca1ff30 100644 --- a/lib/libc/thread/rthread_tls.c +++ b/lib/libc/thread/rthread_tls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_tls.c,v 1.2 2017/08/15 06:38:41 guenther Exp $ */ +/* $OpenBSD: rthread_tls.c,v 1.3 2017/08/15 07:06:29 guenther Exp $ */ /* * Copyright (c) 2004,2005 Ted Unangst * All Rights Reserved. @@ -56,7 +56,7 @@ pthread_key_create(pthread_key_t *key, void (*destructor)(void*)) return (0); } -DEF_STD(pthread_key_create); +DEF_STRONG(pthread_key_create); int pthread_key_delete(pthread_key_t key) @@ -135,7 +135,7 @@ pthread_getspecific(pthread_key_t key) return (rs->data); } -DEF_STD(pthread_getspecific); +DEF_STRONG(pthread_getspecific); int pthread_setspecific(pthread_key_t key, const void *data) @@ -152,7 +152,7 @@ pthread_setspecific(pthread_key_t key, const void *data) return (0); } -DEF_STD(pthread_setspecific); +DEF_STRONG(pthread_setspecific); void _rthread_tls_destructors(pthread_t thread) -- cgit v1.2.3