summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@delorie.com>2003-12-19 16:50:48 +0000
committerDJ Delorie <dj@delorie.com>2003-12-19 16:50:48 +0000
commit75bccd30e3e32323776e1439cc1bf7a788082c7b (patch)
tree3fdeaaff7055d74f0ecbd13a3fde666cceec0466
parentd49d70f3ea56915b4162d68139c86887e82ba7b0 (diff)
downloadgdb-75bccd30e3e32323776e1439cc1bf7a788082c7b.tar.gz
merge from gcc
-rw-r--r--include/ChangeLog5
-rw-r--r--include/fibheap.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index e1c333dee2a..670fe38b312 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-19 Andreas Tobler <a.tobler@schweiz.ch>
+
+ * include/fibheap.h (fibnode): Use __extension__ for
+ bit-fields mark and degree if __GNUC__.
+
2003-12-18 Kazu Hirata <kazu@cs.umass.edu>
* include/fibheap.h (fibnode): Use unsigned long int for
diff --git a/include/fibheap.h b/include/fibheap.h
index addef19db95..4eebaf13ba6 100644
--- a/include/fibheap.h
+++ b/include/fibheap.h
@@ -60,8 +60,8 @@ typedef struct fibnode
fibheapkey_t key;
void *data;
#ifdef __GNUC__
- unsigned long int degree : 31;
- unsigned long int mark : 1;
+ __extension__ unsigned long int degree : 31;
+ __extension__ unsigned long int mark : 1;
#else
unsigned int degree : 31;
unsigned int mark : 1;