diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2008-03-16 08:54:38 +0000 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2008-03-16 08:54:38 +0000 |
| commit | e0a7506f8ec11c1c524fe1d6b52781d168e988db (patch) | |
| tree | 2dcf7858f0c7d236efe32db885baa9379358ec8a /libpthread/linuxthreads.old/cancel.c | |
| parent | e772b90e7e8190112a987f7c18c19a33766acfd0 (diff) | |
| download | uClibc-alpine-e0a7506f8ec11c1c524fe1d6b52781d168e988db.tar.bz2 uClibc-alpine-e0a7506f8ec11c1c524fe1d6b52781d168e988db.tar.xz | |
Merge nptl branch tree with trunk.
Step 7: merge linuxthreads and linuxthread.old folders
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libpthread/linuxthreads.old/cancel.c')
| -rw-r--r-- | libpthread/linuxthreads.old/cancel.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libpthread/linuxthreads.old/cancel.c b/libpthread/linuxthreads.old/cancel.c index ac66c5855..79409675f 100644 --- a/libpthread/linuxthreads.old/cancel.c +++ b/libpthread/linuxthreads.old/cancel.c @@ -37,6 +37,8 @@ extern void __rpc_thread_destroy(void); # error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP" #endif +libpthread_hidden_proto(pthread_setcancelstate) +libpthread_hidden_proto(pthread_setcanceltype) int pthread_setcancelstate(int state, int * oldstate) { @@ -51,6 +53,7 @@ int pthread_setcancelstate(int state, int * oldstate) __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME); return 0; } +libpthread_hidden_def(pthread_setcancelstate) int pthread_setcanceltype(int type, int * oldtype) { @@ -65,6 +68,7 @@ int pthread_setcanceltype(int type, int * oldtype) __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME); return 0; } +libpthread_hidden_def(pthread_setcanceltype) int pthread_cancel(pthread_t thread) { @@ -165,6 +169,7 @@ void _pthread_cleanup_push_defer(struct _pthread_cleanup_buffer * buffer, THREAD_SETMEM(self, p_canceltype, PTHREAD_CANCEL_DEFERRED); THREAD_SETMEM(self, p_cleanup, buffer); } +strong_alias(_pthread_cleanup_push_defer,__pthread_cleanup_push_defer) void _pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer * buffer, int execute) @@ -178,6 +183,8 @@ void _pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer * buffer, THREAD_GETMEM(self, p_canceltype) == PTHREAD_CANCEL_ASYNCHRONOUS) __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME); } +strong_alias(_pthread_cleanup_pop_restore,__pthread_cleanup_pop_restore) + void __pthread_perform_cleanup(char *currentframe) { |