diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-23 09:33:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-23 09:33:19 (GMT) |
| commit | 9deb7bb1f74f240f6b4da6212928fa6546563e7d (patch) | |
| tree | 67c91c99e4aab83b2122ac3e150db97b6ad70119 | |
| parent | 9f7678907a1a06b4696f636854508d52953f514a (diff) | |
| parent | dd905225112e9294cad877b30cf9b893959e4c5b (diff) | |
| download | tcl-9deb7bb1f74f240f6b4da6212928fa6546563e7d.zip tcl-9deb7bb1f74f240f6b4da6212928fa6546563e7d.tar.gz tcl-9deb7bb1f74f240f6b4da6212928fa6546563e7d.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | generic/tclDate.c | 6 | ||||
| -rw-r--r-- | generic/tclGetDate.y | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclDate.c b/generic/tclDate.c index fe7ae7d..5dd07e7 100644 --- a/generic/tclDate.c +++ b/generic/tclDate.c @@ -102,9 +102,6 @@ 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. @@ -210,6 +207,9 @@ typedef enum _DSTMODE { DSTon, DSToff, DSTmaybe } DSTMODE; + + + # ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus # define YY_NULLPTR nullptr diff --git a/generic/tclGetDate.y b/generic/tclGetDate.y index 9c2f483..f8fded2 100644 --- a/generic/tclGetDate.y +++ b/generic/tclGetDate.y @@ -16,7 +16,7 @@ %parse-param {DateInfo* info} %lex-param {DateInfo* info} -%pure-parser +%define api.pure /* %error-verbose would be nice, but our token names are meaningless */ %locations |