From: Ulrich Drepper Date: Fri, 18 Apr 2003 08:01:53 +0000 (+0000) Subject: Update. X-Git-Tag: cvs/glibc-2_3_3~860 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=7d74651eb053324e19605ab8a9421a787ec9f836;p=glibc.git Update. 2003-04-18 Ulrich Drepper * sysdeps/pthread/pthread.h: Don't mark pthread_testcancel with __THROW. --- diff --git a/nptl/ChangeLog b/nptl/ChangeLog index d38913303a..a456d5c575 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2003-04-18 Ulrich Drepper + + * sysdeps/pthread/pthread.h: Don't mark pthread_testcancel with + __THROW. + 2003-04-16 Jakub Jelinek * 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 1c59e1ea2e..1433fe56f7 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. */