diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2009-05-09 18:40:14 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2009-05-09 18:40:14 +0000 |
| commit | 8075bb0fc6925bfb43f0db8e9c5bf22eb9e9f119 (patch) | |
| tree | 08716fe3e8c25a9732600ec718325785e5352c33 /nptl/libc-cancellation.c | |
| parent | 83489168c2447e3fe351dbb302b1026dc9fc512c (diff) | |
Updated to fedora-glibc-20090509T1828cvs/fedora-glibc-2_10-1
Diffstat (limited to 'nptl/libc-cancellation.c')
| -rw-r--r-- | nptl/libc-cancellation.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nptl/libc-cancellation.c b/nptl/libc-cancellation.c index b88a32fefd..cf24f1c0f2 100644 --- a/nptl/libc-cancellation.c +++ b/nptl/libc-cancellation.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2005, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -86,6 +86,10 @@ __libc_disable_asynccancel (int oldtype) return; struct pthread *self = THREAD_SELF; + +#ifdef THREAD_ATOMIC_AND + THREAD_ATOMIC_AND (self, cancelhandling, ~CANCELTYPE_BITMASK); +#else int oldval = THREAD_GETMEM (self, cancelhandling); while (1) @@ -103,6 +107,7 @@ __libc_disable_asynccancel (int oldtype) /* Prepare the next round. */ oldval = curval; } +#endif } |