From 76f1afec34733e145c94c5d4aefc98ef9381f5b4 Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Fri, 19 Dec 2003 16:50:48 +0000
Subject: [PATCH] merge from gcc

---
 include/ChangeLog | 5 +++++
 include/fibheap.h | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/ChangeLog b/include/ChangeLog
index e1c333dee..670fe38b3 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 addef19db..4eebaf13b 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;