diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-09-05 13:45:15 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-09-05 13:45:15 (GMT) |
| commit | 1f6ac7f87e3a127645d7839916f0bc2a6143b9b9 (patch) | |
| tree | ebd9cd2ef1306351bac09ce6e0c22872ad04d953 /generic/tclBasic.c | |
| parent | 2562ea174bddf62331bd7d71ebd4b49f53ad8345 (diff) | |
| parent | 5c9968a001208bb4fc6d06ad040c28bd84b7831f (diff) | |
| download | tcl-1f6ac7f87e3a127645d7839916f0bc2a6143b9b9.zip tcl-1f6ac7f87e3a127645d7839916f0bc2a6143b9b9.tar.gz tcl-1f6ac7f87e3a127645d7839916f0bc2a6143b9b9.tar.bz2 | |
Merge 8.7.
Change some internal function signatures, accounting for the 64-bit era.
Diffstat (limited to 'generic/tclBasic.c')
| -rw-r--r-- | generic/tclBasic.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 222a80c..7d0267e 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -6973,13 +6973,11 @@ ExprWideFunc( Tcl_Obj *const *objv) /* Actual parameter vector. */ { Tcl_WideInt wResult; - Tcl_Obj *objPtr; if (ExprEntierFunc(NULL, interp, objc, objv) != TCL_OK) { return TCL_ERROR; } - objPtr = Tcl_GetObjResult(interp); - TclGetWideBitsFromObj(NULL, objPtr, &wResult); + TclGetWideBitsFromObj(NULL, Tcl_GetObjResult(interp), &wResult); Tcl_SetObjResult(interp, Tcl_NewWideIntObj(wResult)); return TCL_OK; } @@ -7082,7 +7080,7 @@ ExprRandFunc( * Make sure 1 <= randSeed <= (2^31) - 2. See below. */ - iPtr->randSeed &= (unsigned long) 0x7fffffff; + iPtr->randSeed &= 0x7fffffff; if ((iPtr->randSeed == 0) || (iPtr->randSeed == 0x7fffffff)) { iPtr->randSeed ^= 123459876; } @@ -7247,7 +7245,7 @@ ExprSrandFunc( */ iPtr->flags |= RAND_SEED_INITIALIZED; - iPtr->randSeed = (unsigned long) (w & 0x7fffffff); + iPtr->randSeed = (long) w & 0x7fffffff; if ((iPtr->randSeed == 0) || (iPtr->randSeed == 0x7fffffff)) { iPtr->randSeed ^= 123459876; } |