Mercurial > gnulib
changeset 17637:6495fc44132c
obstack: Remove ancient NeXTSTEP gcc support conditional
This change will ease merging with glibc. The "#if ... __NEXT__"
causes a warning with -Wundef which glibc now enables by default.
Problem reported by Will Newton in
<http://lists.gnu.org/archive/html/bug-gnulib/2014-03/msg00032.html>.
glibc <sys/cdefs.h> now uses __extension__ for GCC 2.8 or later,
so go with that.
* lib/obstack.h (__extension__):
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Thu, 27 Mar 2014 13:38:41 -0700 |
| parents | ae63f4dd18f3 |
| children | d8e136f0049a |
| files | ChangeLog lib/obstack.h |
| diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Mar 27 12:55:07 2014 -0700 +++ b/ChangeLog Thu Mar 27 13:38:41 2014 -0700 @@ -1,3 +1,14 @@ +2014-03-27 Paul Eggert <eggert@cs.ucla.edu> + + obstack: Remove ancient NeXTSTEP gcc support conditional + This change will ease merging with glibc. The "#if ... __NEXT__" + causes a warning with -Wundef which glibc now enables by default. + Problem reported by Will Newton in + <http://lists.gnu.org/archive/html/bug-gnulib/2014-03/msg00032.html>. + glibc <sys/cdefs.h> now uses __extension__ for GCC 2.8 or later, + so go with that. + * lib/obstack.h (__extension__): + 2014-03-27 Paul Eggert <eggert@cs.ucla.edu> obstack: merge with glibc changes
--- a/lib/obstack.h Thu Mar 27 12:55:07 2014 -0700 +++ b/lib/obstack.h Thu Mar 27 13:38:41 2014 -0700 @@ -258,10 +258,7 @@ #define obstack_memory_used(h) _obstack_memory_used (h) #if defined __GNUC__ -/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and - does not implement __extension__. But that compiler doesn't define - __GNUC_MINOR__. */ -# if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__) +# if ! (2 < __GNUC__ + (8 <= __GNUC_MINOR__)) # define __extension__ # endif