aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2010-01-05 21:10:30 +0000
committerDJ Delorie <dj@redhat.com>2010-01-05 21:10:30 +0000
commit43e85a8f541dcc299092452d816749cf99e31d60 (patch)
tree13a07425783335abf7d668da97ba93920894dcfb /include
parentce6cca6d61556fecbabbca20f49e8e76545b6bc6 (diff)
downloadgdb-43e85a8f541dcc299092452d816749cf99e31d60.zip
gdb-43e85a8f541dcc299092452d816749cf99e31d60.tar.gz
gdb-43e85a8f541dcc299092452d816749cf99e31d60.tar.bz2
merge from gcc
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog5
-rw-r--r--include/ansidecl.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index cd2b1a7..7e242a2 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 86b0944..8b76647 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