diff options
| author | Jim Meyering <jim@meyering.net> | 1993-04-04 16:36:44 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1993-04-04 16:36:44 +0000 |
| commit | 9cf66fe2b19c3975d4f2e164f59a4377d5976d77 (patch) | |
| tree | 65a652855788c665e776793843b32109816fe985 /lib | |
| parent | febc4c49c10bfbf11e3a1254dbbabb11ae5ae193 (diff) | |
| download | coreutils-9cf66fe2b19c3975d4f2e164f59a4377d5976d77.tar.xz | |
* [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}.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/getdate.y | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/getdate.y b/lib/getdate.y index 05387d056..4d2af5c5e 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) */ |