From 76a67697c890d292d9f32e88cf24f8a3f74e47b9 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 18 Apr 2003 08:08:11 +0000 Subject: Update. * sysdeps/pthread/pthread.h: Don't mark pthread_testcancel, pthread_cancel, pthread_setcancelstate, and pthread_setcanceltype with --- nptl/ChangeLog | 3 ++- nptl/sysdeps/pthread/pthread.h | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nptl/ChangeLog b/nptl/ChangeLog index a456d5c..2d94b14 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,6 +1,7 @@ 2003-04-18 Ulrich Drepper - * sysdeps/pthread/pthread.h: Don't mark pthread_testcancel with + * sysdeps/pthread/pthread.h: Don't mark pthread_testcancel, + pthread_cancel, pthread_setcancelstate, and pthread_setcanceltype with __THROW. 2003-04-16 Jakub Jelinek diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h index 1433fe5..b8073d8 100644 --- a/nptl/sysdeps/pthread/pthread.h +++ b/nptl/sysdeps/pthread/pthread.h @@ -366,14 +366,14 @@ extern int pthread_once (pthread_once_t *__once_control, /* Set cancelability state of current thread to STATE, returning old state in *OLDSTATE if OLDSTATE is not NULL. */ -extern int pthread_setcancelstate (int __state, int *__oldstate) __THROW; +extern int pthread_setcancelstate (int __state, int *__oldstate); /* Set cancellation state of current thread to TYPE, returning the old type in *OLDTYPE if OLDTYPE is not NULL. */ -extern int pthread_setcanceltype (int __type, int *__oldtype) __THROW; +extern int pthread_setcanceltype (int __type, int *__oldtype); /* Cancel THREAD immediately or at the next possibility. */ -extern int pthread_cancel (pthread_t __th) __THROW; +extern int pthread_cancel (pthread_t __th); /* Test for pending cancellation for the current thread and terminate the thread as per pthread_exit(PTHREAD_CANCELED) if it has been -- cgit v1.1