aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-07-31 22:30:30 -0700
committerUlrich Drepper <drepper@redhat.com>2009-07-31 22:30:30 -0700
commitbd03a1afa2445e5942e49c28ae1f7920b7f38a45 (patch)
treeec765e30222eef68a9c5a92ec514a53176e0534f /nptl
parent52ec0eb3dbe78d18a4ef70021389b2e1493b47cb (diff)
downloadglibc-bd03a1afa2445e5942e49c28ae1f7920b7f38a45.zip
glibc-bd03a1afa2445e5942e49c28ae1f7920b7f38a45.tar.gz
glibc-bd03a1afa2445e5942e49c28ae1f7920b7f38a45.tar.bz2
Macro cleanup.
Better definition of the *_NITSET macros.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog4
-rw-r--r--nptl/descr.h16
2 files changed, 12 insertions, 8 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 20031b5..3ebe841 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-31 Ulrich Drepper <drepper@redhat.com>
+
+ * descr.h: Better definition of *_BITMASK macros for cancellation.
+
2009-07-29 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/tls.h (TLS_TCB_ALIGN): Define explicitly to 32.
diff --git a/nptl/descr.h b/nptl/descr.h
index 22e774a..9c366e7 100644
--- a/nptl/descr.h
+++ b/nptl/descr.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2006, 2007, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -243,25 +243,25 @@ struct pthread
int cancelhandling;
/* Bit set if cancellation is disabled. */
#define CANCELSTATE_BIT 0
-#define CANCELSTATE_BITMASK 0x01
+#define CANCELSTATE_BITMASK (0x01 << CANCELSTATE_BIT)
/* Bit set if asynchronous cancellation mode is selected. */
#define CANCELTYPE_BIT 1
-#define CANCELTYPE_BITMASK 0x02
+#define CANCELTYPE_BITMASK (0x01 << CANCELTYPE_BIT)
/* Bit set if canceling has been initiated. */
#define CANCELING_BIT 2
-#define CANCELING_BITMASK 0x04
+#define CANCELING_BITMASK (0x01 << CANCELING_BIT)
/* Bit set if canceled. */
#define CANCELED_BIT 3
-#define CANCELED_BITMASK 0x08
+#define CANCELED_BITMASK (0x01 << CANCELED_BIT)
/* Bit set if thread is exiting. */
#define EXITING_BIT 4
-#define EXITING_BITMASK 0x10
+#define EXITING_BITMASK (0x01 << EXITING_BIT)
/* Bit set if thread terminated and TCB is freed. */
#define TERMINATED_BIT 5
-#define TERMINATED_BITMASK 0x20
+#define TERMINATED_BITMASK (0x01 << TERMINATED_BIT)
/* Bit set if thread is supposed to change XID. */
#define SETXID_BIT 6
-#define SETXID_BITMASK 0x40
+#define SETXID_BITMASK (0x01 << SETXID_BIT)
/* Mask for the rest. Helps the compiler to optimize. */
#define CANCEL_RESTMASK 0xffffff80