Remove __THROW from cancellation points.

diff --git a/linuxthreads/semaphore.h b/linuxthreads/semaphore.h
index 9c283c864495af9b709b9e7dbe0ad99304fa68a1..7b09ea9319df94d8dd0b9f73aebaa8c82c0b5d97 100644 (file)
--- a/linuxthreads/semaphore.h
+++ b/linuxthreads/semaphore.h
@@ -64,13 +64,12 @@ extern int sem_close (sem_t *__sem) __THROW;
 extern int sem_unlink (__const char *__name) __THROW;
 
 /* Wait for SEM being posted.  */
-extern int sem_wait (sem_t *__sem) __THROW;
+extern int sem_wait (sem_t *__sem);
 
 #ifdef __USE_XOPEN2K
 /* Similar to `sem_wait' but wait only until ABSTIME.  */
 extern int sem_timedwait (sem_t *__restrict __sem,
-                         __const struct timespec *__restrict __abstime)
-     __THROW;
+                         __const struct timespec *__restrict __abstime);
 #endif
 
 /* Test whether SEM is posted.  */

diff --git a/linuxthreads/sysdeps/pthread/pthread.h b/linuxthreads/sysdeps/pthread/pthread.h
index efaf8513a560b8ae2e0fb987a49e5434fe9a6c69..95a10cb3664b135c532158fbbaec0059c6cd0f0c 100644 (file)
--- a/linuxthreads/sysdeps/pthread/pthread.h
+++ b/linuxthreads/sysdeps/pthread/pthread.h
@@ -582,19 +582,19 @@ 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 __cancelthread) __THROW;
+extern int pthread_cancel (pthread_t __cancelthread);
 
 /* Test for pending cancellation for the current thread and terminate
    the thread as per pthread_exit(PTHREAD_CANCELED) if it has been
    cancelled.  */
-extern void pthread_testcancel (void) __THROW;
+extern void pthread_testcancel (void);
 
 
 /* Install a cleanup handler: ROUTINE will be called with arguments ARG