merge with 3.10

diff --git a/lib/obstack.h b/lib/obstack.h
index 840a63baaa099a1401b09691be77e0005443a0dd..2f5ec61ae705a70c1d5d7ec91e5b662ebd51efea 100644 (file)
--- 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
 

diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index 8cefc672e70c8200a0c90dad8bd7a509388f0f50..e29819a2f0e9532ae775118a6b5861f383b37ec3 100644 (file)
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -1,3 +1,7 @@
+Fri Nov 04 17:27:55 1994  Jim Meyering  (meyering@comco.com)
+
+       Version 3.10.
+
 Thu Nov 03 12:59:34 1994  Jim Meyering  (meyering@comco.com)
 
        * makepath.h: New file.