about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-09-07 20:52:41 +0000
committerUlrich Drepper <drepper@redhat.com>2004-09-07 20:52:41 +0000
commite0329987e39550dbc6db6cb936322efb852ea99b (patch)
tree9c0141475b52d36529e61c39f71743bf0c76b402 /nptl
parentf863a5a5aff07502d2842fd52fbc6fde8dffab32 (diff)
downloadglibc-e0329987e39550dbc6db6cb936322efb852ea99b.tar.gz
glibc-e0329987e39550dbc6db6cb936322efb852ea99b.tar.xz
glibc-e0329987e39550dbc6db6cb936322efb852ea99b.zip
Update.
2004-09-07  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/pthread/pthread.h (pthread_once): Remove __THROW since
	the initialization function might throw.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog7
-rw-r--r--nptl/sysdeps/pthread/pthread.h7
2 files changed, 11 insertions, 3 deletions
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.