diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-06-17 00:53:04 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-06-17 00:53:04 (GMT) |
| commit | 5f37ca27b1c063da4d683acdadc4ac1e458fa543 (patch) | |
| tree | edceb0c6951153cfff0e2f2ee9a653ecae86314e /generic | |
| parent | d5ee2656ca67c1e5b1bd7a57a84a51f9dc22bcca (diff) | |
| parent | 8824470ed0704024b804da2d301cf0d05a63ee04 (diff) | |
| download | tcl-5f37ca27b1c063da4d683acdadc4ac1e458fa543.zip tcl-5f37ca27b1c063da4d683acdadc4ac1e458fa543.tar.gz tcl-5f37ca27b1c063da4d683acdadc4ac1e458fa543.tar.bz2 | |
merge 8.6
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclCompile.c | 4 | ||||
| -rw-r--r-- | generic/tclDate.c | 8 | ||||
| -rw-r--r-- | generic/tclEvent.c | 2 | ||||
| -rw-r--r-- | generic/tclInt.h | 5 |
4 files changed, 8 insertions, 11 deletions
diff --git a/generic/tclCompile.c b/generic/tclCompile.c index c0b5dcc..c0203dd 100644 --- a/generic/tclCompile.c +++ b/generic/tclCompile.c @@ -3239,8 +3239,10 @@ EnterCmdWordData( TclAdvanceLines(&wordLine, last, tokenPtr->start); TclAdvanceContinuations(&wordLine, &wordNext, tokenPtr->start - envPtr->source); + /* See Ticket 4b61afd660 */ wwlines[wordIdx] = - (TclWordKnownAtCompileTime(tokenPtr, NULL) ? wordLine : -1); + ((wordIdx == 0) || TclWordKnownAtCompileTime(tokenPtr, NULL)) + ? wordLine : -1; ePtr->line[wordIdx] = wordLine; ePtr->next[wordIdx] = wordNext; last = tokenPtr->start; diff --git a/generic/tclDate.c b/generic/tclDate.c index 6222a8a..e4dd000 100644 --- a/generic/tclDate.c +++ b/generic/tclDate.c @@ -359,14 +359,8 @@ typedef short int yytype_int16; #ifndef YYSIZE_T # ifdef __SIZE_TYPE__ # define YYSIZE_T __SIZE_TYPE__ -# elif defined size_t -# define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t # else -# define YYSIZE_T unsigned int +# define YYSIZE_T size_t # endif #endif diff --git a/generic/tclEvent.c b/generic/tclEvent.c index 8305410..b0b8188 100644 --- a/generic/tclEvent.c +++ b/generic/tclEvent.c @@ -1462,6 +1462,8 @@ VwaitVarProc( int *donePtr = clientData; *donePtr = 1; + Tcl_UntraceVar(interp, name1, TCL_TRACE_WRITES|TCL_TRACE_UNSETS, + VwaitVarProc, clientData); return NULL; } diff --git a/generic/tclInt.h b/generic/tclInt.h index fa91528..7ea37bb 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -48,9 +48,8 @@ #else #include <string.h> #endif -#if defined(_WIN32) -#include <crtdefs.h> -#elif defined(STDC_HEADERS) +#if defined(STDC_HEADERS) || defined(__STDC__) || defined(__C99__FUNC__) \ + || defined(__cplusplus) || defined(_MSC_VER) #include <stddef.h> #else typedef int ptrdiff_t; |