merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 4328b98a45c753da660f5a89f7c2f68f55cb4271..e1c333dee2a2aebf6d3e60cc49a8c949335ee623 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-18  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * include/fibheap.h (fibnode): Use unsigned long int for
+       bit-fields if __GNUC__ is defined.
+
 2003-12-04  H.J. Lu  <hongjiu.lu@intel.com>
 
        * bfdlink.h (bfd_link_info): Change relax_finalizing to

diff --git a/include/fibheap.h b/include/fibheap.h
index fc37f9ef635eb91b1366a17218046286786f851c..addef19db95cd40d901fc494e913cda41c7cfc19 100644 (file)
--- a/include/fibheap.h
+++ b/include/fibheap.h
@@ -59,8 +59,13 @@ typedef struct fibnode
   struct fibnode *right;
   fibheapkey_t key;
   void *data;
+#ifdef __GNUC__
+  unsigned long int degree : 31;
+  unsigned long int mark : 1;
+#else
   unsigned int degree : 31;
   unsigned int mark : 1;
+#endif
 } *fibnode_t;
 
 extern fibheap_t fibheap_new PARAMS ((void));