summaryrefslogtreecommitdiff
path: root/libpthread/nptl
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2011-03-20 02:21:38 +0100
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2012-06-15 14:00:29 +0200
commit293173f87072bbc0cafc457d5d8a6039f4d1d259 (patch)
treecbc03b300d8d1f3913f2503299a4bb4db2372a35 /libpthread/nptl
parent995b4989cdde07816b807cfae620ee85814b9f7d (diff)
pthreadP.h: avoid shadow warnings
Change CANCELLATION_P macro and adapt usage. Signed-off-by: Peter S. Mazinger <ps.m@gmx.net> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libpthread/nptl')
-rw-r--r--libpthread/nptl/pthreadP.h2
-rw-r--r--libpthread/nptl/pthread_testcancel.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/libpthread/nptl/pthreadP.h b/libpthread/nptl/pthreadP.h
index 850562b1f..ae24afd0c 100644
--- a/libpthread/nptl/pthreadP.h
+++ b/libpthread/nptl/pthreadP.h
@@ -221,7 +221,7 @@ extern int __pthread_debug attribute_hidden;
/* Cancellation test. */
#define CANCELLATION_P(self) \
do { \
- int cancelhandling = THREAD_GETMEM (self, cancelhandling); \
+ cancelhandling = THREAD_GETMEM (self, cancelhandling); \
if (CANCEL_ENABLED_AND_CANCELED (cancelhandling)) \
{ \
THREAD_SETMEM (self, result, PTHREAD_CANCELED); \
diff --git a/libpthread/nptl/pthread_testcancel.c b/libpthread/nptl/pthread_testcancel.c
index e9b17b493..fbd597a77 100644
--- a/libpthread/nptl/pthread_testcancel.c
+++ b/libpthread/nptl/pthread_testcancel.c
@@ -24,5 +24,6 @@
void
pthread_testcancel (void)
{
+ int cancelhandling;
CANCELLATION_P (THREAD_SELF);
}