aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-04-18 08:01:53 +0000
committerUlrich Drepper <drepper@redhat.com>2003-04-18 08:01:53 +0000
commit7d74651eb053324e19605ab8a9421a787ec9f836 (patch)
tree45fd53db47e77c6bbe53550f1a2a146183298968 /nptl
parent7c2842bfc5cdc2df19cc2fdd1a127b8ac4bf3474 (diff)
downloadglibc-7d74651eb053324e19605ab8a9421a787ec9f836.zip
glibc-7d74651eb053324e19605ab8a9421a787ec9f836.tar.gz
glibc-7d74651eb053324e19605ab8a9421a787ec9f836.tar.bz2
Update.
2003-04-18 Ulrich Drepper <drepper@redhat.com> * sysdeps/pthread/pthread.h: Don't mark pthread_testcancel with __THROW.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog5
-rw-r--r--nptl/sysdeps/pthread/pthread.h8
2 files changed, 11 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index d389133..a456d5c 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-18 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/pthread/pthread.h: Don't mark pthread_testcancel with
+ __THROW.
+
2003-04-16 Jakub Jelinek <jakub@redhat.com>
* tst-cancel4.c (do_test): Use %zd instead of %d when printing cnt.
diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
index 1c59e1e..1433fe5 100644
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/nptl/sysdeps/pthread/pthread.h
@@ -377,8 +377,12 @@ extern int pthread_cancel (pthread_t __th) __THROW;
/* 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;
+ cancelled.
+
+ Note that this function is explicitly not marked to not throw an
+ exception in C++ code. If cancellation is implemented by unwinding
+ this is necessary to have the compiler generate the unwind information. */
+extern void pthread_testcancel (void);
/* Cancellation handling with integration into exception handling. */