summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDJ Delorie <dj@delorie.com>2004-12-10 22:04:41 +0000
committerDJ Delorie <dj@delorie.com>2004-12-10 22:04:41 +0000
commitec09e03a833bad571d9da6c500b5d6cb8a45b847 (patch)
tree21417d09b2b8d3a85b1d3304850448e438e4725b /include
parent5390a7431a02d241b32ad4f2b2f452ccfad68b9f (diff)
downloadbinutils-redhat-ec09e03a833bad571d9da6c500b5d6cb8a45b847.tar.gz
merge from gcc
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog5
-rw-r--r--include/fibheap.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 33157f3066..198570979d 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-11 Ben Elliston <bje@au.ibm.com>
+
+ * fibheap.h (struct fibnode): Only use unsigned long bitfields
+ when __GNUC__ is defined and ints are less than 32-bits wide.
+
2004-11-29 Tomer Levi <Tomer.Levi@nsc.com>
* opcode/crx.h (enum operand_type): Rename rbase_cst4 to rbase_dispu4.
diff --git a/include/fibheap.h b/include/fibheap.h
index 4eebaf13ba..e1e843ddbb 100644
--- a/include/fibheap.h
+++ b/include/fibheap.h
@@ -59,7 +59,7 @@ typedef struct fibnode
struct fibnode *right;
fibheapkey_t key;
void *data;
-#ifdef __GNUC__
+#if defined (__GNUC__) && (!defined (SIZEOF_INT) || SIZEOF_INT < 4)
__extension__ unsigned long int degree : 31;
__extension__ unsigned long int mark : 1;
#else