diff options
| author | dgp <dgp@users.sourceforge.net> | 2020-10-23 15:06:38 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2020-10-23 15:06:38 (GMT) |
| commit | e4cbc8b503b922edad1192aca46aa462d32a54f3 (patch) | |
| tree | d99c6c60b1d7347a1d65bb1ff1b8fddce8dacad3 /generic/tclInt.h | |
| parent | d5c584a6f5c4c155df02ed11686133aebe50e5aa (diff) | |
| parent | ef66b6c75b59edb19fd09b920b6f67baa0c27c20 (diff) | |
| download | tcl-e4cbc8b503b922edad1192aca46aa462d32a54f3.zip tcl-e4cbc8b503b922edad1192aca46aa462d32a54f3.tar.gz tcl-e4cbc8b503b922edad1192aca46aa462d32a54f3.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclInt.h')
| -rw-r--r-- | generic/tclInt.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h index a14c837..62f01f3 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -4816,11 +4816,12 @@ MODULE_SCOPE Tcl_PackageInitProc Procbodytest_SafeInit; #define TclNewIndexObj(objPtr, w) \ do { \ + size_t _w = (w); \ TclIncrObjsAllocated(); \ TclAllocObjStorage(objPtr); \ (objPtr)->refCount = 0; \ (objPtr)->bytes = NULL; \ - (objPtr)->internalRep.wideValue = (Tcl_WideInt)((w) + 1) - 1; \ + (objPtr)->internalRep.wideValue = ((_w) == TCL_INDEX_NONE) ? -1 : (Tcl_WideInt)(_w); \ (objPtr)->typePtr = &tclIntType; \ TCL_DTRACE_OBJ_CREATE(objPtr); \ } while (0) @@ -4851,7 +4852,7 @@ MODULE_SCOPE Tcl_PackageInitProc Procbodytest_SafeInit; (objPtr) = Tcl_NewWideIntObj(w) #define TclNewIndexObj(objPtr, w) \ - (objPtr) = (w == TCL_INDEX_NONE) ? Tcl_NewWideIntObj(-1) : Tcl_NewWideIntObj(w) + (objPtr) = ((w) == TCL_INDEX_NONE) ? Tcl_NewWideIntObj(-1) : Tcl_NewWideIntObj(w) #define TclNewDoubleObj(objPtr, d) \ (objPtr) = Tcl_NewDoubleObj(d) |