From 40a59a4c4605b06ba043814f54b06f5dbf95c677 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Fri, 10 Dec 2004 22:04:41 +0000 Subject: merge from gcc --- include/ChangeLog | 5 +++++ include/fibheap.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/ChangeLog b/include/ChangeLog index 33157f3066..198570979d 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2004-12-11 Ben Elliston + + * fibheap.h (struct fibnode): Only use unsigned long bitfields + when __GNUC__ is defined and ints are less than 32-bits wide. + 2004-11-29 Tomer Levi * opcode/crx.h (enum operand_type): Rename rbase_cst4 to rbase_dispu4. diff --git a/include/fibheap.h b/include/fibheap.h index 4eebaf13ba..e1e843ddbb 100644 --- a/include/fibheap.h +++ b/include/fibheap.h @@ -59,7 +59,7 @@ typedef struct fibnode struct fibnode *right; fibheapkey_t key; void *data; -#ifdef __GNUC__ +#if defined (__GNUC__) && (!defined (SIZEOF_INT) || SIZEOF_INT < 4) __extension__ unsigned long int degree : 31; __extension__ unsigned long int mark : 1; #else -- cgit v1.2.1