summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1993-04-04 16:36:44 +0000
committerJim Meyering <jim@meyering.net>1993-04-04 16:36:44 +0000
commitf4654147c09a44c6cec113d26e33c60c0813436d (patch)
tree343373019f99a170204a50d9c584ebac457ad15f
parent5bcef80b36bdfe4d61f2036be73eb882c982e46d (diff)
downloadgnulib-f4654147c09a44c6cec113d26e33c60c0813436d.tar.gz
* [sgi]: Undefine timezone before including <time.h>.
* [time.h vs sys/time.h]: Fix boolean algebra typo from Mar 31 consolidation. * Move static dcls of yyerror and yylex to a point following the definition of those symbols to getdate_{yyerror,yylex}.
-rw-r--r--lib/getdate.y20
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/getdate.y b/lib/getdate.y
index 05387d056b..4d2af5c5e6 100644
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -1,5 +1,5 @@
%{
-/* $Revision: 2.1 $
+/* $Revision: 1.2 $
**
** Originally written by Steven M. Bellovin <smb@research.att.com> while
** at the University of North Carolina at Chapel Hill. Later tweaked by
@@ -49,7 +49,11 @@ char *alloca ();
#include <sys/types.h>
-#if !(defined (USG) || !defined (sgi) || !defined (__386BSD__)) || defined(BSD4_2) || defined(BSD4_1C) || (defined (hp9000) && !defined (hpux)) || defined(_AIX)
+#if sgi
+#undef timezone
+#endif
+
+#if !(defined (USG) || defined (sgi) || defined (__386BSD__)) || defined(BSD4_2) || defined(BSD4_1C) || (defined (hp9000) && !defined (hpux)) || defined(_AIX)
#include <sys/time.h>
#else
#include <time.h>
@@ -79,22 +83,18 @@ struct timeb {
#include <string.h>
#endif
-#if sgi
-#undef timezone
-#endif
-
extern struct tm *localtime();
-static int yylex ();
-static int yyerror ();
-
#define yyparse getdate_yyparse
#define yylex getdate_yylex
#define yyerror getdate_yyerror
+static int yylex ();
+static int yyerror ();
+
#if !defined(lint) && !defined(SABER)
static char RCS[] =
- "$Header: str2date.y,v 2.1 90/09/06 08:15:06 cronan Exp $";
+ "$Header: /w/src/cvsroot/fileutils/lib/getdate.y,v 1.2 1993/04/04 15:21:49 meyering Exp $";
#endif /* !defined(lint) && !defined(SABER) */