diff options
author | DJ Delorie <dj@redhat.com> | 2003-12-19 16:50:48 +0000 |
---|---|---|
committer | DJ Delorie <dj@redhat.com> | 2003-12-19 16:50:48 +0000 |
commit | 76f1afec34733e145c94c5d4aefc98ef9381f5b4 (patch) | |
tree | d4d355aaa7e12233e817f8e0b1feb1082a2949d4 | |
parent | 08bf2e60dee606b94dfad86ee2a74cb69cb664f9 (diff) | |
download | newlib-76f1afec34733e145c94c5d4aefc98ef9381f5b4.zip newlib-76f1afec34733e145c94c5d4aefc98ef9381f5b4.tar.gz newlib-76f1afec34733e145c94c5d4aefc98ef9381f5b4.tar.bz2 |
merge from gcc
-rw-r--r-- | include/ChangeLog | 5 | ||||
-rw-r--r-- | include/fibheap.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index e1c333d..670fe38 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 addef19..4eebaf1 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; |