diff options
| author | DJ Delorie <dj@redhat.com> | 2010-01-06 00:10:23 +0300 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2010-01-06 00:10:23 +0300 |
| commit | 7fce58cbda7f66bb6e6080f004666b8f25c0fb84 (patch) | |
| tree | 995cb90769998c53649acf0688cf750e83015bb3 /include | |
| parent | 37f42cc1c8129936f70d4df9f96255f2377e99a9 (diff) | |
merge from gcc
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/ansidecl.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index cd2b1a7df..7e242a2da 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2010-01-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR bootstrap/41771 + * ansidecl.h: Fix inline test for C99 and Sun Studio cc. + 2009-12-29 Joel Brobecker <brobecker@adacore.com> * dwarf2.h (enum dwarf_attribute): Add DW_AT_GNAT_descriptive_type. diff --git a/include/ansidecl.h b/include/ansidecl.h index 86b094474..8b7664742 100644 --- a/include/ansidecl.h +++ b/include/ansidecl.h @@ -1,6 +1,6 @@ /* ANSI and traditional C compatability macros Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005, 2006, 2007, 2009 + 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -178,7 +178,7 @@ So instead we use the macro below and test it against specific values. */ /* inline requires special treatment; it's in C99, and GCC >=2.7 supports it too, but it's not in C89. */ #undef inline -#if __STDC_VERSION__ > 199901L || defined(__cplusplus) +#if __STDC_VERSION__ >= 199901L || defined(__cplusplus) || (defined(__SUNPRO_C) && defined(__C99FEATURES__)) /* it's a keyword */ #else # if GCC_VERSION >= 2007 |