diff options
| -rw-r--r-- | io/sys/poll.h | 4 | ||||
| -rw-r--r-- | linuxthreads/ChangeLog | 5 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/pthread/pthread.h | 7 | ||||
| -rw-r--r-- | nptl/ChangeLog | 7 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread.h | 7 |
5 files changed, 23 insertions, 7 deletions
diff --git a/io/sys/poll.h b/io/sys/poll.h index bf1c9e2030..89a27eab2b 100644 --- a/io/sys/poll.h +++ b/io/sys/poll.h @@ -1,5 +1,5 @@ /* Compatibility definitions for System V `poll' interface. - Copyright (C) 1994,96,97,98,99,2000,2001 Free Software Foundation, Inc. + Copyright (C) 1994,96,97,98,99,2000,2001,2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -45,7 +45,7 @@ __BEGIN_DECLS an event to occur; if TIMEOUT is -1, block until an event occurs. Returns the number of file descriptors with events, zero if timed out, or -1 for errors. */ -extern int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout) __THROW; +extern int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout); __END_DECLS diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 90ad1f5907..6cbf62ced0 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,8 @@ +2004-09-07 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/pthread/pthread.h (pthread_once): Remove __THROW since + the initialization function might throw. + 2004-08-30 Roland McGrath <roland@frob.com> * Makefile (libpthread-abi-frozen): New variable. diff --git a/linuxthreads/sysdeps/pthread/pthread.h b/linuxthreads/sysdeps/pthread/pthread.h index c4a5f2caac..80c2db80b4 100644 --- a/linuxthreads/sysdeps/pthread/pthread.h +++ b/linuxthreads/sysdeps/pthread/pthread.h @@ -573,9 +573,12 @@ extern void *pthread_getspecific (pthread_key_t __key) __THROW; /* Guarantee that the initialization function INIT_ROUTINE will be called only once, even if pthread_once is executed several times with the same ONCE_CONTROL argument. ONCE_CONTROL must point to a static or - extern variable initialized to PTHREAD_ONCE_INIT. */ + extern variable initialized to PTHREAD_ONCE_INIT. + + The initialization functions might throw exception which is why + this function is not marked with __THROW. */ extern int pthread_once (pthread_once_t *__once_control, - void (*__init_routine) (void)) __THROW; + void (*__init_routine) (void)); /* Functions for handling cancellation. */ diff --git a/nptl/ChangeLog b/nptl/ChangeLog index f7f3d29e01..0530809ed3 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,10 @@ +2004-09-07 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/pthread/pthread.h (pthread_once): Remove __THROW since + the initialization function might throw. + 2005-09-05 Richard Henderson <rth@redhat.com> - + * sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h (SINGLE_THREAD_P): Move definition inside libpthread, libc, librt check. Provide definition for rtld. diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h index f5e9167a6b..1b0463c10c 100644 --- a/nptl/sysdeps/pthread/pthread.h +++ b/nptl/sysdeps/pthread/pthread.h @@ -390,9 +390,12 @@ extern int pthread_getaffinity_np (pthread_t __th, size_t __cpusetsize, /* Guarantee that the initialization function INIT_ROUTINE will be called only once, even if pthread_once is executed several times with the same ONCE_CONTROL argument. ONCE_CONTROL must point to a static or - extern variable initialized to PTHREAD_ONCE_INIT. */ + extern variable initialized to PTHREAD_ONCE_INIT. + + The initialization functions might throw exception which is why + this function is not marked with __THROW. */ extern int pthread_once (pthread_once_t *__once_control, - void (*__init_routine) (void)) __THROW; + void (*__init_routine) (void)); /* Functions for handling cancellation. |