diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-10-27 14:19:07 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-10-27 14:19:07 +0000 |
| commit | c70ca1fa69c9a95108664b4132b7188a686cc9e4 (patch) | |
| tree | 19fa3a22f0ab1ce323bb2bfd787ffc86627196be /linuxthreads/cancel.c | |
| parent | 91cc83ff9745491a0d6673f36df9cdabd397d748 (diff) | |
| download | glibc-c70ca1fa69c9a95108664b4132b7188a686cc9e4.tar glibc-c70ca1fa69c9a95108664b4132b7188a686cc9e4.tar.gz glibc-c70ca1fa69c9a95108664b4132b7188a686cc9e4.tar.bz2 glibc-c70ca1fa69c9a95108664b4132b7188a686cc9e4.zip | |
Update.
* sysdeps/unix/sysv/linux/powerpc/pread.c: Do not use the i386 version.
Instead call the system call wrapper function using an 64bit argument.
* sysdeps/unix/sysv/linux/powerpc/pread64.c: Likewise.
* sysdeps/unix/sysv/linux/powerpc/pwrite.c: Likewise.
* sysdeps/unix/sysv/linux/powerpc/pwrite64.c: Likewise.
Diffstat (limited to 'linuxthreads/cancel.c')
| -rw-r--r-- | linuxthreads/cancel.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/linuxthreads/cancel.c b/linuxthreads/cancel.c index e9cb10cc7c..3ff595418b 100644 --- a/linuxthreads/cancel.c +++ b/linuxthreads/cancel.c @@ -77,9 +77,9 @@ void _pthread_cleanup_push(struct _pthread_cleanup_buffer * buffer, void (*routine)(void *), void * arg) { pthread_descr self = thread_self(); - buffer->routine = routine; - buffer->arg = arg; - buffer->prev = THREAD_GETMEM(self, p_cleanup); + buffer->__routine = routine; + buffer->__arg = arg; + buffer->__prev = THREAD_GETMEM(self, p_cleanup); THREAD_SETMEM(self, p_cleanup, buffer); } @@ -87,18 +87,18 @@ void _pthread_cleanup_pop(struct _pthread_cleanup_buffer * buffer, int execute) { pthread_descr self = thread_self(); - if (execute) buffer->routine(buffer->arg); - THREAD_SETMEM(self, p_cleanup, buffer->prev); + if (execute) buffer->__routine(buffer->__arg); + THREAD_SETMEM(self, p_cleanup, buffer->__prev); } void _pthread_cleanup_push_defer(struct _pthread_cleanup_buffer * buffer, void (*routine)(void *), void * arg) { pthread_descr self = thread_self(); - buffer->routine = routine; - buffer->arg = arg; - buffer->canceltype = THREAD_GETMEM(self, p_canceltype); - buffer->prev = THREAD_GETMEM(self, p_cleanup); + buffer->__routine = routine; + buffer->__arg = arg; + buffer->__canceltype = THREAD_GETMEM(self, p_canceltype); + buffer->__prev = THREAD_GETMEM(self, p_cleanup); THREAD_SETMEM(self, p_canceltype, PTHREAD_CANCEL_DEFERRED); THREAD_SETMEM(self, p_cleanup, buffer); } @@ -107,9 +107,9 @@ void _pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer * buffer, int execute) { pthread_descr self = thread_self(); - if (execute) buffer->routine(buffer->arg); - THREAD_SETMEM(self, p_cleanup, buffer->prev); - THREAD_SETMEM(self, p_canceltype, buffer->canceltype); + if (execute) buffer->__routine(buffer->__arg); + THREAD_SETMEM(self, p_cleanup, buffer->__prev); + THREAD_SETMEM(self, p_canceltype, buffer->__canceltype); if (THREAD_GETMEM(self, p_canceled) && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE && THREAD_GETMEM(self, p_canceltype) == PTHREAD_CANCEL_ASYNCHRONOUS) @@ -120,8 +120,8 @@ void __pthread_perform_cleanup(void) { pthread_descr self = thread_self(); struct _pthread_cleanup_buffer * c; - for (c = THREAD_GETMEM(self, p_cleanup); c != NULL; c = c->prev) - c->routine(c->arg); + for (c = THREAD_GETMEM(self, p_cleanup); c != NULL; c = c->__prev) + c->__routine(c->__arg); } #ifndef PIC |