diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-15 15:20:29 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-15 15:20:29 (GMT) |
commit | 4796062aab8a24df621cf33dbe862f72b36986f8 (patch) | |
tree | 29b9e228043f436e5eaff478e6178f21c6c185ee /generic/tclGetDate.y | |
parent | 7934f521d7f3b837fc6430fe78d9320756af1d82 (diff) | |
parent | 2d85a1f9deb33cad80923f44a691189b7aefd8a5 (diff) | |
download | tcl-4796062aab8a24df621cf33dbe862f72b36986f8.zip tcl-4796062aab8a24df621cf33dbe862f72b36986f8.tar.gz tcl-4796062aab8a24df621cf33dbe862f72b36986f8.tar.bz2 |
Merge tip-548
Diffstat (limited to 'generic/tclGetDate.y')
-rw-r--r-- | generic/tclGetDate.y | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/generic/tclGetDate.y b/generic/tclGetDate.y index dcb6d47..e6602f3 100644 --- a/generic/tclGetDate.y +++ b/generic/tclGetDate.y @@ -46,6 +46,14 @@ #endif /* _MSC_VER */ /* + * Meridian: am, pm, or 24-hour style. + */ + +typedef enum _MERIDIAN { + MERam, MERpm, MER24 +} MERIDIAN; + +/* * yyparse will accept a 'struct DateInfo' as its parameter; that's where the * parsed fields will be returned. */ @@ -63,7 +71,7 @@ typedef struct DateInfo { time_t dateHour; time_t dateMinutes; time_t dateSeconds; - int dateMeridian; + MERIDIAN dateMeridian; int dateHaveTime; time_t dateTimezone; @@ -150,14 +158,6 @@ typedef enum _DSTMODE { DSTon, DSToff, DSTmaybe } DSTMODE; -/* - * Meridian: am, pm, or 24-hour style. - */ - -typedef enum _MERIDIAN { - MERam, MERpm, MER24 -} MERIDIAN; - %} %union { @@ -765,9 +765,9 @@ LookupWord( YYSTYPE* yylvalPtr, char *buff) { - register char *p; - register char *q; - register const TABLE *tp; + char *p; + char *q; + const TABLE *tp; int i, abbrev; /* @@ -890,8 +890,8 @@ TclDatelex( YYLTYPE* location, DateInfo *info) { - register char c; - register char *p; + char c; + char *p; char buff[20]; int Count; |