diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 19:30:07 -0800 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 19:30:17 -0800 |
| commit | 9508808a1d7d8bf33b77273bb8187bd038bc2244 (patch) | |
| tree | c7f453df10343b35022c87e9140d8150cd34eef6 | |
| parent | 5c9ef58ec4bcb2def9e30f0b156f9cfcb1d0d163 (diff) | |
| parent | dbc5879d9ab39df3a54ed9b34a6c9e55a8bb8f65 (diff) | |
Merge remote branch 'origin/master' into nptl_merge
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
| -rw-r--r-- | libpthread/linuxthreads.old/forward.c | 2 | ||||
| -rw-r--r-- | libpthread/linuxthreads.old/sysdeps/pthread/pthread.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/libpthread/linuxthreads.old/forward.c b/libpthread/linuxthreads.old/forward.c index f5afc2f98..402b15543 100644 --- a/libpthread/linuxthreads.old/forward.c +++ b/libpthread/linuxthreads.old/forward.c @@ -165,8 +165,6 @@ FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0) FORWARD2 (_pthread_cleanup_push, void, (struct _pthread_cleanup_buffer * buffer, void (*routine)(void *), void * arg), (buffer, routine, arg), return) FORWARD2 (_pthread_cleanup_push_defer, void, (struct _pthread_cleanup_buffer * buffer, void (*routine)(void *), void * arg), (buffer, routine, arg), return) -libc_hidden_def(_pthread_cleanup_push_defer) FORWARD2 (_pthread_cleanup_pop, void, (struct _pthread_cleanup_buffer * buffer, int execute), (buffer, execute), return) FORWARD2 (_pthread_cleanup_pop_restore, void, (struct _pthread_cleanup_buffer * buffer, int execute), (buffer, execute), return) -libc_hidden_def(_pthread_cleanup_pop_restore) diff --git a/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h b/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h index b1dcd1417..38d566731 100644 --- a/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h +++ b/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h @@ -642,7 +642,6 @@ 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; -libc_hidden_proto(_pthread_cleanup_push_defer) extern void __pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *__buffer, void (*__routine) (void *), void *__arg) __THROW; @@ -656,7 +655,6 @@ extern void __pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *__buff extern void _pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *__buffer, int __execute) __THROW; -libc_hidden_proto(_pthread_cleanup_pop_restore) extern void __pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *__buffer, int __execute) __THROW; #endif |