about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--nptl/descr.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f9cf634a44..291f758832 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 a502048b44..7fe4b6c943 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;