merge with 1.9

[gnulib.git] / lib / getdate.y

diff --git a/lib/getdate.y b/lib/getdate.y
index ebfb7c9..1d56904 100644 (file)
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -31,6 +31,25 @@
 #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__
+#define alloca __builtin_alloca
+#else
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#else
+#ifdef _AIX
+ #pragma alloca
+#else
+void *alloca ();
+#endif
+#endif
+#endif
+
 #ifdef __GNUC__
 #undef alloca
 #define alloca __builtin_alloca
@@ -41,7 +60,7 @@
 #ifdef _AIX /* for Bison */
  #pragma alloca
 #else
-char *alloca ();
+void *alloca ();
 #endif
 #endif
 #endif
@@ -78,7 +97,7 @@ char *alloca ();
 #undef timezone /* needed for sgi */
 #endif
 
-#if defined(HAVE_SYS_TIMEB_H) || (!defined(USG) && defined(HAVE_FTIME))
+#if defined(HAVE_SYS_TIMEB_H)
 #include <sys/timeb.h>
 #else
 /*
@@ -119,7 +138,7 @@ static int yyerror ();
 
 #if    !defined(lint) && !defined(SABER)
 static char RCS[] =
-       "$Header: /w/src/cvsroot/shellutils/lib/getdate.y,v 1.5 1993/09/08 18:23:16 meyering Exp $";
+       "$Header: str2date.y,v 2.1 90/09/06 08:15:06 cronan Exp $";
 #endif /* !defined(lint) && !defined(SABER) */