about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2014-10-13 11:12:28 -0700
committerRoland McGrath <roland@hack.frob.com>2014-10-13 11:12:28 -0700
commit53544380266a8eb38bef9389562fba3ed58a0d11 (patch)
treed040f7c483990e8cf4bb8e11102f15c04a2f6514 /nptl
parentfcb32af153a745414b0d949e707c9485ab77d6ba (diff)
downloadglibc-53544380266a8eb38bef9389562fba3ed58a0d11.tar.gz
glibc-53544380266a8eb38bef9389562fba3ed58a0d11.tar.xz
glibc-53544380266a8eb38bef9389562fba3ed58a0d11.zip
Diffstat (limited to 'nptl')
-rw-r--r--nptl/pthreadP.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index d4415ba933..2f489cb913 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -227,8 +227,8 @@ extern int __pthread_debug attribute_hidden;
 /* Cancellation test.  */
 #define CANCELLATION_P(self) \
   do {									      \
-    int cancelhandling = THREAD_GETMEM (self, cancelhandling);		      \
-    if (CANCEL_ENABLED_AND_CANCELED (cancelhandling))			      \
+    int _cancelhandling = THREAD_GETMEM (self, cancelhandling);		      \
+    if (CANCEL_ENABLED_AND_CANCELED (_cancelhandling))			      \
       {									      \
 	THREAD_SETMEM (self, result, PTHREAD_CANCELED);			      \
 	__do_cancel ();							      \