# HG changeset patch
# User Jim Meyering <jim@meyering.net>
# Date 766762849 0
# Node ID eeeec8731bb9284a856ad8468601a9033540d4cb
# Parent  883cc816a727bf6eeaddf984cf92478ac3f977f4
merge with 1.9.4e

diff -r 883cc816a727 -r eeeec8731bb9 lib/getdate.y
--- a/lib/getdate.y	Tue Apr 19 02:30:46 1994 +0000
+++ b/lib/getdate.y	Tue Apr 19 13:40:49 1994 +0000
@@ -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 @@
 #if	defined(TEST)
 
 /* ARGSUSED */
+int
 main(ac, av)
     int		ac;
     char	*av[];
diff -r 883cc816a727 -r eeeec8731bb9 lib/getopt.c
--- a/lib/getopt.c	Tue Apr 19 02:30:46 1994 +0000
+++ b/lib/getopt.c	Tue Apr 19 13:40:49 1994 +0000
@@ -190,11 +190,12 @@
 /* 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__ */