aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2015-06-24 16:50:08 -0700
committerRoland McGrath <roland@hack.frob.com>2015-06-24 18:11:01 -0700
commit1dfacd8bbba72d2cc87a217e5f5cc3c9582a30d2 (patch)
treef3072cebebf7c4d24c4a8798033250e114d796a7
parent45a8f0e6629d7772b9fa1aef0389bc51a094424d (diff)
downloadtermbaud-roland/cancelhandling.tar.gz
termbaud-roland/cancelhandling.tar.xz
termbaud-roland/cancelhandling.zip
NPTL: Give cancelhandling fields type unsigned int.roland/cancelhandling
-rw-r--r--ChangeLog5
-rw-r--r--nptl/descr.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f9cf634a44f..291f758832a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2015-06-24 Roland McGrath <roland@hack.frob.com>
+ * nptl/descr.h (struct pthread): Change type of fields cancelhandling
+ and parent_cancelhandling from 'int' to 'unsigned int'.
+
+2015-06-24 Roland McGrath <roland@hack.frob.com>
+
* nptl/descr.h (struct pthread): Change type of field setxid_futex
to 'unsigned int'.
diff --git a/nptl/descr.h b/nptl/descr.h
index a502048b442..7fe4b6c943a 100644
--- a/nptl/descr.h
+++ b/nptl/descr.h
@@ -256,7 +256,7 @@ struct pthread
#define HAVE_CLEANUP_JMP_BUF
/* Flags determining processing of cancellation. */
- int cancelhandling;
+ unsigned int cancelhandling;
/* Bit set if cancellation is disabled. */
#define CANCELSTATE_BIT 0
#define CANCELSTATE_BITMASK (0x01 << CANCELSTATE_BIT)
@@ -322,7 +322,7 @@ struct pthread
/* The parent's cancel handling at the time of the pthread_create
call. This might be needed to undo the effects of a cancellation. */
- int parent_cancelhandling;
+ unsigned int parent_cancelhandling;
/* Lock to synchronize access to the descriptor. */
int lock;