From cdd0bb4bde4f6885045e65860de0320ccf6b23f6 Mon Sep 17 00:00:00 2001 From: jkratoch Date: Mon, 25 Apr 2011 18:05:37 +0000 Subject: [PATCH] include/ * ansidecl.h (ENUM_BITFIELD): New, from gcc/system.h. contrib/ * paranoia.cc (ENUM_BITFIELD): Remove. gcc/ * system.h (ENUM_BITFIELD): Remove. libcpp/ * system.h (ENUM_BITFIELD): Remove. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@172933 138bc75d-0d04-0410-961f-82ee72b054a4 --- contrib/ChangeLog | 4 ++++ contrib/paranoia.cc | 1 - gcc/ChangeLog | 4 ++++ gcc/system.h | 9 --------- include/ChangeLog | 4 ++++ include/ansidecl.h | 9 +++++++++ libcpp/ChangeLog | 4 ++++ libcpp/system.h | 9 --------- 8 files changed, 25 insertions(+), 19 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 8363e78..c6adbc8 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2011-04-25 Jan Kratochvil + + * paranoia.cc (ENUM_BITFIELD): Remove. + 2011-04-08 Joseph Myers * gcc_update (gcc/config/arm/arm-tables.opt): New dependencies. diff --git a/contrib/paranoia.cc b/contrib/paranoia.cc index ce21d35..8e8500e 100644 --- a/contrib/paranoia.cc +++ b/contrib/paranoia.cc @@ -169,7 +169,6 @@ lines }; #undef DEFTREECODE -#define ENUM_BITFIELD(X) enum X #define class klass #include "real.h" diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a115d78..bc72679 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2011-04-25 Jan Kratochvil + + * system.h (ENUM_BITFIELD): Remove. + 2011-04-25 Maxim Kuvyrkov Eric Botcazou diff --git a/gcc/system.h b/gcc/system.h index 81daaf1..147801b 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -598,15 +598,6 @@ extern int vsnprintf(char *, size_t, const char *, va_list); #define HOST_BIT_BUCKET "/dev/null" #endif -/* Be conservative and only use enum bitfields with GCC. - FIXME: provide a complete autoconf test for buggy enum bitfields. */ - -#if (GCC_VERSION > 2000) -#define ENUM_BITFIELD(TYPE) __extension__ enum TYPE -#else -#define ENUM_BITFIELD(TYPE) unsigned int -#endif - #ifndef offsetof #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *) 0)->MEMBER) #endif diff --git a/include/ChangeLog b/include/ChangeLog index 4d05ba0..fcabfb8 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2011-04-25 Jan Kratochvil + + * ansidecl.h (ENUM_BITFIELD): New, from gcc/system.h. + 2011-03-31 Tristan Gingold * dwarf2.h (dwarf_line_number_hp_sfc_ops): New enum. diff --git a/include/ansidecl.h b/include/ansidecl.h index 8b76647..c39ce2f 100644 --- a/include/ansidecl.h +++ b/include/ansidecl.h @@ -416,6 +416,15 @@ So instead we use the macro below and test it against specific values. */ #define EXPORTED_CONST const #endif +/* Be conservative and only use enum bitfields with GCC. + FIXME: provide a complete autoconf test for buggy enum bitfields. */ + +#if (GCC_VERSION > 2000) +#define ENUM_BITFIELD(TYPE) __extension__ enum TYPE +#else +#define ENUM_BITFIELD(TYPE) unsigned int +#endif + #ifdef __cplusplus } #endif diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 2601302..d287d12 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,7 @@ +2011-04-25 Jan Kratochvil + + * system.h (ENUM_BITFIELD): Remove. + 2011-04-24 Jakub Jelinek PR preprocessor/48740 diff --git a/libcpp/system.h b/libcpp/system.h index 5bdfeed..aa458fc 100644 --- a/libcpp/system.h +++ b/libcpp/system.h @@ -357,15 +357,6 @@ extern void abort (void); || (__STDC_VERSION__ >= 199901L)) #endif -/* Be conservative and only use enum bitfields with GCC. - FIXME: provide a complete autoconf test for buggy enum bitfields. */ - -#if (GCC_VERSION > 2000) -#define ENUM_BITFIELD(TYPE) __extension__ enum TYPE -#else -#define ENUM_BITFIELD(TYPE) unsigned int -#endif - #ifndef offsetof #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *) 0)->MEMBER) #endif -- 2.7.4