diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-23 10:09:39 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-23 10:09:39 (GMT) |
| commit | 80626f6c0c41ad8c8fd2b8fb4b8ca47ba99b64e2 (patch) | |
| tree | 51328df87f3cfac9d5a3e2d9bb057087db1b1a1e | |
| parent | b50d4cd9cf51684cc3d3f0c71067617f48229644 (diff) | |
| parent | dd905225112e9294cad877b30cf9b893959e4c5b (diff) | |
| download | tcl-80626f6c0c41ad8c8fd2b8fb4b8ca47ba99b64e2.zip tcl-80626f6c0c41ad8c8fd2b8fb4b8ca47ba99b64e2.tar.gz tcl-80626f6c0c41ad8c8fd2b8fb4b8ca47ba99b64e2.tar.bz2 | |
Merge 8.6. Merge 8.6. Fix tclClockFmt.c build
| -rw-r--r-- | generic/tclClockFmt.c | 12 | ||||
| -rw-r--r-- | generic/tclDate.c | 16 | ||||
| -rw-r--r-- | generic/tclGetDate.y | 16 |
3 files changed, 22 insertions, 22 deletions
diff --git a/generic/tclClockFmt.c b/generic/tclClockFmt.c index 8e14a7d..2e63008 100644 --- a/generic/tclClockFmt.c +++ b/generic/tclClockFmt.c @@ -907,22 +907,22 @@ FindTokenBegin( case CTOKT_INT: case CTOKT_WIDE: /* should match at least one digit */ - while (!isdigit(UCHAR(*p)) && (p = TclUtfNext(p)) < end) {}; + while (!isdigit(UCHAR(*p)) && (p = Tcl_UtfNext(p)) < end) {}; return p; break; case CTOKT_WORD: c = *(tok->tokWord.start); /* should match at least to the first char of this word */ - while (*p != c && (p = TclUtfNext(p)) < end) {}; + while (*p != c && (p = Tcl_UtfNext(p)) < end) {}; return p; break; case CTOKT_SPACE: - while (!isspace(UCHAR(*p)) && (p = TclUtfNext(p)) < end) {}; + while (!isspace(UCHAR(*p)) && (p = Tcl_UtfNext(p)) < end) {}; return p; break; case CTOKT_CHAR: c = *((char *)tok->map->data); - while (*p != c && (p = TclUtfNext(p)) < end) {}; + while (*p != c && (p = Tcl_UtfNext(p)) < end) {}; return p; break; } @@ -2135,7 +2135,7 @@ word_tok: if (isspace(UCHAR(*p))) { fss->scnSpaceCount++; } - p = TclUtfNext(p); + p = Tcl_UtfNext(p); wordTok->tokWord.end = p; } break; @@ -3134,7 +3134,7 @@ word_tok: wordTok->map = &FmtWordTokenMap; AllocTokenInChain(tok, fmtTok, fss->fmtTokC); tokCnt++; } - p = TclUtfNext(p); + p = Tcl_UtfNext(p); wordTok->tokWord.end = p; } break; diff --git a/generic/tclDate.c b/generic/tclDate.c index bb94955..f9630e4 100644 --- a/generic/tclDate.c +++ b/generic/tclDate.c @@ -2482,7 +2482,7 @@ static const TABLE MilitaryTable[] = { static inline const char * bypassSpaces( - register const char *s) + const char *s) { while (TclIsSpaceProc(*s)) { s++; @@ -2555,9 +2555,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; /* @@ -2680,8 +2680,8 @@ TclDatelex( YYLTYPE* location, DateInfo *info) { - register char c; - register char *p; + char c; + char *p; char buff[20]; int Count; const char *tokStart; @@ -2704,7 +2704,7 @@ TclDatelex( /* * Convert the string into a number; count the number of digits. */ - register int num = c - '0'; + int num = c - '0'; p = (char *)yyInput; while (isdigit(UCHAR(c = *(++p)))) { if (num >= 0) { @@ -2772,7 +2772,7 @@ TclDatelex( */ if (ret == tZONE || ret == tDAYZONE) { c = *yyInput; - if (isdigit(c)) { /* literal not a TZ */ + if (isdigit(UCHAR(c))) { /* literal not a TZ */ yyInput = tokStart; return *yyInput++; } diff --git a/generic/tclGetDate.y b/generic/tclGetDate.y index b21320b..485d54a 100644 --- a/generic/tclGetDate.y +++ b/generic/tclGetDate.y @@ -683,7 +683,7 @@ static const TABLE MilitaryTable[] = { static inline const char * bypassSpaces( - register const char *s) + const char *s) { while (TclIsSpaceProc(*s)) { s++; @@ -756,9 +756,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; /* @@ -881,8 +881,8 @@ TclDatelex( YYLTYPE* location, DateInfo *info) { - register char c; - register char *p; + char c; + char *p; char buff[20]; int Count; const char *tokStart; @@ -905,7 +905,7 @@ TclDatelex( /* * Convert the string into a number; count the number of digits. */ - register int num = c - '0'; + int num = c - '0'; p = (char *)yyInput; while (isdigit(UCHAR(c = *(++p)))) { if (num >= 0) { @@ -973,7 +973,7 @@ TclDatelex( */ if (ret == tZONE || ret == tDAYZONE) { c = *yyInput; - if (isdigit(c)) { /* literal not a TZ */ + if (isdigit(UCHAR(c))) { /* literal not a TZ */ yyInput = tokStart; return *yyInput++; } |