From e0a7506f8ec11c1c524fe1d6b52781d168e988db Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Sun, 16 Mar 2008 08:54:38 +0000 Subject: Merge nptl branch tree with trunk. Step 7: merge linuxthreads and linuxthread.old folders Signed-off-by: Carmelo Amoroso --- libpthread/linuxthreads.old/sysdeps/pthread/pthread.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libpthread/linuxthreads.old/sysdeps/pthread/pthread.h') diff --git a/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h b/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h index 448636bd9..870e37fa5 100644 --- a/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h +++ b/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h @@ -635,6 +635,9 @@ extern void _pthread_cleanup_pop (struct _pthread_cleanup_buffer *__buffer, extern void _pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *__buffer, void (*__routine) (void *), void *__arg) __THROW; +extern void __pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *__buffer, + void (*__routine) (void *), + void *__arg) __THROW; /* Remove a cleanup handler as pthread_cleanup_pop does, but also restores the cancellation type that was in effect when the matching @@ -645,6 +648,8 @@ extern void _pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *__buffe extern void _pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *__buffer, int __execute) __THROW; +extern void __pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *__buffer, + int __execute) __THROW; #endif -- cgit v1.2.3