From 6298fe5f892c4094450148524c15044171a975a0 Mon Sep 17 00:00:00 2001 From: jca <> Date: Sat, 4 Nov 2017 22:53:57 +0000 Subject: Revert recent changes to unbreak ports/net/samba While it is not clear (to me) why that ports ends up with corrupted shared libs, reverting those changes fixes the issue and should allow us to close p2k17 more smoothly. Discussed with a bunch, ok ajacoutot@ guenther@ --- src/lib/libc/include/thread_private.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/lib/libc') diff --git a/src/lib/libc/include/thread_private.h b/src/lib/libc/include/thread_private.h index 6c695ee5ee..fd530d7dff 100644 --- a/src/lib/libc/include/thread_private.h +++ b/src/lib/libc/include/thread_private.h @@ -1,4 +1,4 @@ -/* $OpenBSD: thread_private.h,v 1.31 2017/10/28 21:23:14 guenther Exp $ */ +/* $OpenBSD: thread_private.h,v 1.32 2017/11/04 22:53:57 jca Exp $ */ /* PUBLIC DOMAIN: No Rights Reserved. Marco S Hyman */ @@ -344,6 +344,12 @@ struct rthread_storage { void *data; }; +struct rthread_cleanup_fn { + void (*fn)(void *); + void *arg; + struct rthread_cleanup_fn *next; +}; + struct tib; struct stack; struct pthread { @@ -361,7 +367,7 @@ struct pthread { pthread_cond_t blocking_cond; struct pthread_attr attr; struct rthread_storage *local_storage; - struct __thread_cleanup *cleanup_fns; + struct rthread_cleanup_fn *cleanup_fns; /* cancel received in a delayed cancel block? */ int delayed_cancel; -- cgit v1.2.3-55-g6feb