diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-13 20:09:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-13 20:09:42 (GMT) |
| commit | e05045246f6a09ad6c214cd7045e431e7c07a9fd (patch) | |
| tree | 6bbebfff4bfc6409ef2ebc9b64cc10894d5eb917 /generic/tclDate.c | |
| parent | 6ba55114e28426856f8905b08e31340c268459d5 (diff) | |
| parent | 343b0349d4d4b41ca86832298dead909b1ef055d (diff) | |
| download | tcl-e05045246f6a09ad6c214cd7045e431e7c07a9fd.zip tcl-e05045246f6a09ad6c214cd7045e431e7c07a9fd.tar.gz tcl-e05045246f6a09ad6c214cd7045e431e7c07a9fd.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclDate.c')
| -rw-r--r-- | generic/tclDate.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/generic/tclDate.c b/generic/tclDate.c index aa65e77..89bc254 100644 --- a/generic/tclDate.c +++ b/generic/tclDate.c @@ -95,6 +95,17 @@ #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. */ @@ -112,7 +123,7 @@ typedef struct DateInfo { time_t dateHour; time_t dateMinutes; time_t dateSeconds; - int dateMeridian; + MERIDIAN dateMeridian; int dateHaveTime; time_t dateTimezone; @@ -199,17 +210,6 @@ typedef enum _DSTMODE { DSTon, DSToff, DSTmaybe } DSTMODE; -/* - * Meridian: am, pm, or 24-hour style. - */ - -typedef enum _MERIDIAN { - MERam, MERpm, MER24 -} MERIDIAN; - - - - # ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus # define YY_NULLPTR nullptr |