diff options
author | Jim Meyering <jim@meyering.net> | 1994-11-05 13:37:38 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 1994-11-05 13:37:38 +0000 |
commit | 9bfdace83ab116ff43f0131e841febfd961da22d (patch) | |
tree | d18f94503b3ef793aad7ded1034ad04b8faa127a | |
parent | fad3ef71a45303c04ee7cf096db58c93672d2bca (diff) | |
download | coreutils-9bfdace83ab116ff43f0131e841febfd961da22d.tar.xz |
merge with 3.10
-rw-r--r-- | lib/obstack.h | 2 | ||||
-rw-r--r-- | old/fileutils/ChangeLog | 4 |
2 files changed, 5 insertions, 1 deletions
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 diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog index 8cefc672e..e29819a2f 100644 --- 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. |