From 9f657ec18473b9b465ef7ffeb6c6b57389515eff Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Sat, 5 Nov 1994 13:37:49 +0000
Subject: [PATCH] merge with 3.10

---
 lib/obstack.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/obstack.h b/lib/obstack.h
index 840a63baa..2f5ec61ae 100644
--- a/lib/obstack.h
+++ b/lib/obstack.h
@@ -272,7 +272,7 @@ int obstack_chunk_size (struct obstack *obstack);
 /* 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 || !__GNUC_MINOR__
+#if __GNUC__ < 2 || (NeXt && !__GNUC_MINOR__)
 #define __extension__
 #endif
 
-- 
2.11.0