aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2003-12-19 04:04:44 +0000
committerDJ Delorie <dj@redhat.com>2003-12-19 04:04:44 +0000
commit35f075b6eafd3a2d7bc241589102ee5ecb176de3 (patch)
treeac4d95be06f2faa133804afdd5fb6687708ffca2
parentd40fcd7bc1cc1ae5069f87d82b63e4e5253c5dd9 (diff)
downloadfsf-binutils-gdb-35f075b6eafd3a2d7bc241589102ee5ecb176de3.zip
fsf-binutils-gdb-35f075b6eafd3a2d7bc241589102ee5ecb176de3.tar.gz
fsf-binutils-gdb-35f075b6eafd3a2d7bc241589102ee5ecb176de3.tar.bz2
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 4328b98..e1c333de 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 fc37f9e..addef19 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));