From: Jim Meyering <jim@meyering.net>
Date: Tue, 19 Apr 1994 13:40:49 +0000 (+0000)
Subject: merge with 1.9.4e
X-Git-Tag: cvs-readonly~8915
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=21d350029ea6612cba85bba1d6fde7342d5b36ec;p=gnulib.git

merge with 1.9.4e
---

diff --git a/lib/getdate.y b/lib/getdate.y
index f3014fb94..6d93a57d6 100644
--- 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 812258ae3..654f76159 100644
--- 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__ */