obstack: Remove ancient NeXTSTEP gcc support conditional
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 27 Mar 2014 20:38:41 +0000 (13:38 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 27 Mar 2014 20:41:16 +0000 (13:41 -0700)
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__):

ChangeLog
lib/obstack.h

index 10d4f7a755e7018931bd707b23d5552536452389..0d0ac9e90903dd85c41989cf225c3ed3d1959262 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
index f847a5370698ac8d142a3238f7857052fb108e8f..f92492fc687526c6b76ceba86dd3c65e70dd586e 100644 (file)
@@ -258,10 +258,7 @@ extern int obstack_exit_failure;
 #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