diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-01 11:55:40 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-01 11:55:40 (GMT) |
| commit | 74f9c831ac95d109ce2a36f39ee1f6389789bc47 (patch) | |
| tree | d143605e7972f08cc3bdff1d320ccbe293d9b5f2 /generic/tclInt.h | |
| parent | a2d61902c5917155fc102959689720cf55d07895 (diff) | |
| parent | b89c01475a4aa977cfa56b2292504c60de9a7427 (diff) | |
| download | tcl-74f9c831ac95d109ce2a36f39ee1f6389789bc47.zip tcl-74f9c831ac95d109ce2a36f39ee1f6389789bc47.tar.gz tcl-74f9c831ac95d109ce2a36f39ee1f6389789bc47.tar.bz2 | |
Merge tip-548
Diffstat (limited to 'generic/tclInt.h')
| -rw-r--r-- | generic/tclInt.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h index 689e400..7666292 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -1384,7 +1384,7 @@ MODULE_SCOPE void TclThreadDataKeySet(Tcl_ThreadDataKey *keyPtr, */ #define TCL_TSD_INIT(keyPtr) \ - Tcl_GetThreadData((keyPtr), sizeof(ThreadSpecificData)) + (ThreadSpecificData *)Tcl_GetThreadData((keyPtr), sizeof(ThreadSpecificData)) /* *---------------------------------------------------------------- @@ -2259,6 +2259,7 @@ typedef struct Interp { #define TCL_EVAL_FILE 0x02 #define TCL_EVAL_SOURCE_IN_FRAME 0x10 #define TCL_EVAL_NORESOLVE 0x20 +#define TCL_EVAL_DISCARD_RESULT 0x40 /* * Flag bits for Interp structures: @@ -4223,7 +4224,6 @@ MODULE_SCOPE int TclIndexDecode(int encoded, int endValue); #ifdef USE_DTRACE #ifndef _TCLDTRACE_H -typedef const char *TclDTraceStr; #include "tclDTrace.h" #endif #define TCL_DTRACE_OBJ_CREATE(objPtr) TCL_OBJ_CREATE(objPtr) @@ -4524,8 +4524,8 @@ MODULE_SCOPE void TclDbInitNewObj(Tcl_Obj *objPtr, const char *file, #define TclUnpackBignum(objPtr, bignum) \ do { \ - register Tcl_Obj *bignumObj = (objPtr); \ - register int bignumPayload = \ + Tcl_Obj *bignumObj = (objPtr); \ + int bignumPayload = \ PTR2INT(bignumObj->internalRep.twoPtrValue.ptr2); \ if (bignumPayload == -1) { \ (bignum) = *((mp_int *) bignumObj->internalRep.twoPtrValue.ptr1); \ |