Skip to content

Commit c250862

Browse files
author
jan.nijtmans
committed
Merge 9.0
2 parents 9931abc + 7b25f98 commit c250862

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

generic/tclDate.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -719,14 +719,14 @@ static const yytype_int8 yytranslate[] =
719719
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
720720
static const yytype_int16 yyrline[] =
721721
{
722-
0, 171, 171, 172, 176, 179, 182, 185, 188, 191,
723-
194, 197, 201, 204, 209, 215, 221, 226, 230, 234,
724-
238, 242, 246, 252, 253, 256, 260, 264, 268, 272,
725-
276, 282, 288, 292, 297, 298, 303, 307, 312, 316,
726-
321, 328, 332, 338, 338, 340, 345, 350, 352, 357,
727-
359, 360, 368, 379, 393, 398, 401, 404, 407, 410,
728-
413, 416, 421, 424, 429, 433, 437, 443, 446, 449,
729-
454, 472, 475
722+
0, 174, 174, 175, 179, 182, 185, 188, 192, 196,
723+
199, 202, 206, 209, 214, 220, 226, 231, 235, 239,
724+
243, 247, 251, 257, 258, 261, 265, 269, 273, 277,
725+
281, 287, 293, 297, 302, 303, 308, 312, 317, 321,
726+
326, 333, 337, 343, 343, 345, 350, 355, 357, 362,
727+
364, 365, 373, 384, 399, 404, 407, 410, 413, 416,
728+
419, 422, 427, 430, 435, 440, 445, 452, 455, 458,
729+
463, 481, 484
730730
};
731731
#endif
732732

generic/tclGetDate.y

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
* don't like that, and complain. Simply disable the warning to silence them.
4444
*/
4545

46-
ifdef _MSC_VER
46+
#ifdef _MSC_VER
4747
#pragma warning( disable : 4102 )
4848
#elif defined (__clang__)
4949
#elif (__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))

unix/Makefile.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2162,7 +2162,6 @@ dist-packages: configure-packages
21622162
# the .c file.
21632163

21642164
#
2165-
# Remark: see [54a305cb88]. tclDate.c is manually edited, removing the unused "yynerrs" variable
21662165
gendate:
21672166
bison --output-file=$(GENERIC_DIR)/tclDate.c \
21682167
--no-lines \

0 commit comments

Comments
 (0)