From c546950745ac0b2fe69bfb6d70910f1900eeb5bd Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Fri, 10 Dec 2004 22:04:33 +0000
Subject: [PATCH] merge from gcc

---
 include/ChangeLog | 5 +++++
 include/fibheap.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/ChangeLog b/include/ChangeLog
index 33157f306..198570979 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 4eebaf13b..e1e843ddb 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