summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@delorie.com>2003-12-19 04:04:44 +0000
committerDJ Delorie <dj@delorie.com>2003-12-19 04:04:44 +0000
commitc20c711f680c0f30ec2f72c5fb708f90e1e31b19 (patch)
tree82c997c696980181c96c5eb2fcd573e60421a2ee
parent46714c5c945c2c6bba197c61276e4db278c2e545 (diff)
downloadgdb-c20c711f680c0f30ec2f72c5fb708f90e1e31b19.tar.gz
merge from gcc
-rw-r--r--include/ChangeLog5
-rw-r--r--include/fibheap.h5
2 files changed, 10 insertions, 0 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 4328b98a45c..e1c333dee2a 100644
--- 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 fc37f9ef635..addef19db95 100644
--- 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));