merge with 1.9.4e

diff --git a/lib/getdate.y b/lib/getdate.y
index f3014fb944c7b22e3a8e37507fc01220e3092f95..6d93a57d6fd6776aec56ca699e09f6889c40e465 100644 (file)
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -31,26 +31,6 @@
 #undef static
 #endif
 
-/* The following block of alloca-related preprocessor directives is here
-   solely to allow compilation by non GNU-C compilers of the C parser
-   produced from this file by old versions of bison.  Newer versions of
-   bison include a block similar to this one in bison.simple.  */
-
-#ifdef __GNUC__
-#undef alloca
-#define alloca __builtin_alloca
-#else
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#else
-#ifdef _AIX /* for Bison */
- #pragma alloca
-#else
-void *alloca ();
-#endif
-#endif
-#endif
-
 #include <stdio.h>
 #include <ctype.h>
 
@@ -967,6 +947,7 @@ get_date(p, now)
 #if    defined(TEST)
 
 /* ARGSUSED */
+int
 main(ac, av)
     int                ac;
     char       *av[];

diff --git a/lib/getopt.c b/lib/getopt.c
index 812258ae3d73a4bbafbc0c8a7e2e00ab29c84ff9..654f7615989466bdb925378ee578dea608f9bd56 100644 (file)
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -190,11 +190,12 @@ my_index (str, chr)
 /* If using GCC, we can safely declare strlen this way.
    If not using GCC, it is ok not to declare it.  */
 #ifdef __GNUC__
+/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
+   That was relevant to code that was here before.  */
 #ifndef __STDC__
-/* Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
-   Enable Emacs to compile on it.  */
-#include <stddef.h>
-extern size_t strlen (const char *);
+/* gcc with -traditional declares the built-in strlen to return int,
+   and has done so at least since version 2.4.5. -- rms.  */
+extern int strlen (const char *);
 #endif /* not __STDC__ */
 #endif /* __GNUC__ */
 

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index c14faaa3cca863b6d57cf24b7a2004295731f4cf..e24fe0dc27ac76934f97d7493bd0bfa6fa9161f3 100644 (file)
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -1,3 +1,13 @@
+Mon Apr 18 19:54:24 1994  Jim Meyering  (meyering@comco.com)
+
+       * documentation: Change uses of `pathname' and `path' as per
+       GNU standards.
+
+       * long-options.c (parse-long-options): Take a new argument,
+       command_name, for use in --version output.
+       * basename.c, dirname.c, echo.c, expr.c, printf.c, stty.c, test.c,
+       yes.c (main): Update callers.
+
 Wed Mar 30 08:53:21 1994  Jim Meyering  (meyering@comco.com)
 
        * configure.in: Use AC_SET_MAKE.

diff --git a/old/sh-utils/NEWS b/old/sh-utils/NEWS
index bbe82f967d3df70f3b766f44ac654613bd31144f..52934ba71fa468e485bd8488dc5b91e475348591 100644 (file)
--- a/old/sh-utils/NEWS
+++ b/old/sh-utils/NEWS
@@ -1,5 +1,7 @@
 User visible changes in release 2.0
 * Configure properly determines options for stty on SCO ODT 3.0 systems.
+* `date -d' works better.  Before, `date -d '4apr94'' produced
+  `Sun Apr  3 23:00:00 CDT 1994'.
 User visible changes in release 1.9.4
 * Repair stty option handling.
 User visible changes in release 1.9.3