summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/thread.cc
diff options
context:
space:
mode:
Diffstat (limited to 'winsup/cygwin/thread.cc')
-rw-r--r--winsup/cygwin/thread.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
index f7ba60a70..bb38ff3ed 100644
--- a/winsup/cygwin/thread.cc
+++ b/winsup/cygwin/thread.cc
@@ -1069,9 +1069,6 @@ pthread::pop_cleanup_handler (int const execute)
mutex.lock ();
- /* We will no honor cancels since the thread is exiting. */
- cancelstate = PTHREAD_CANCEL_DISABLE;
-
if (cleanup_stack != NULL)
{
__pthread_cleanup_handler *handler = cleanup_stack;
@@ -1087,6 +1084,9 @@ pthread::pop_cleanup_handler (int const execute)
void
pthread::pop_all_cleanup_handlers ()
{
+ /* We will no honor cancels since the thread is exiting. */
+ cancelstate = PTHREAD_CANCEL_DISABLE;
+
while (cleanup_stack != NULL)
pop_cleanup_handler (1);
}