merge from gcc
This commit is contained in:
parent
5a1964ecbd
commit
ae1cc67dd4
2 changed files with 7 additions and 2 deletions
|
@ -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>
|
2003-12-18 Kazu Hirata <kazu@cs.umass.edu>
|
||||||
|
|
||||||
* include/fibheap.h (fibnode): Use unsigned long int for
|
* include/fibheap.h (fibnode): Use unsigned long int for
|
||||||
|
|
|
@ -60,8 +60,8 @@ typedef struct fibnode
|
||||||
fibheapkey_t key;
|
fibheapkey_t key;
|
||||||
void *data;
|
void *data;
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
unsigned long int degree : 31;
|
__extension__ unsigned long int degree : 31;
|
||||||
unsigned long int mark : 1;
|
__extension__ unsigned long int mark : 1;
|
||||||
#else
|
#else
|
||||||
unsigned int degree : 31;
|
unsigned int degree : 31;
|
||||||
unsigned int mark : 1;
|
unsigned int mark : 1;
|
||||||
|
|
Loading…
Reference in a new issue