diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-13 21:00:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-13 21:00:28 (GMT) |
| commit | 261bde3156d50771907d0e386439fd241874b9eb (patch) | |
| tree | 9de88c6c9cb22c4cd7db19f5995f880ba4906d7f /generic/tclDate.c | |
| parent | 4b48c76e1c40761ebe4173552178854265fb50c6 (diff) | |
| parent | bce65c12f657a40e26fc4b42de6047d98ee7e012 (diff) | |
| download | tcl-261bde3156d50771907d0e386439fd241874b9eb.zip tcl-261bde3156d50771907d0e386439fd241874b9eb.tar.gz tcl-261bde3156d50771907d0e386439fd241874b9eb.tar.bz2 | |
Eliminate dependency in test-suite on Unicode functions. Merge tip-548. Fix build with -DTCL_NO_DEPRECATED
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 32c71de..bf8a150 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 |