diff options
author | dgp <dgp@users.sourceforge.net> | 2024-02-20 17:53:31 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2024-02-20 17:53:31 (GMT) |
commit | fc9f52bfc316f12ce29e686bea8a79a1652705ba (patch) | |
tree | 9607d8eeaf776f13feee69f35aaf1c22d4c6bc8d /generic | |
parent | 2e9720463bb86d4ff7a96d5a9aff6a3358a7125b (diff) | |
parent | 1b93f5c69d1f43f8225f215de5f233db6e7eaa5c (diff) | |
download | tcl-fc9f52bfc316f12ce29e686bea8a79a1652705ba.zip tcl-fc9f52bfc316f12ce29e686bea8a79a1652705ba.tar.gz tcl-fc9f52bfc316f12ce29e686bea8a79a1652705ba.tar.bz2 |
merge 8.6
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tclExecute.c | 5 | ||||
-rw-r--r-- | generic/tclNotify.c | 2 | ||||
-rw-r--r-- | generic/tclOO.c | 4 | ||||
-rw-r--r-- | generic/tclPkg.c | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 5950b86..0b25113 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -9187,8 +9187,9 @@ ExecuteExtendedBinaryMathOp( break; case INST_MULT: - if ((type1 != TCL_NUMBER_LONG) || (type2 != TCL_NUMBER_LONG) - || (sizeof(Tcl_WideInt) < 2*sizeof(long))) { + if ((sizeof(Tcl_WideInt) < 2*sizeof(long)) + || (type1 != TCL_NUMBER_LONG) + || (type2 != TCL_NUMBER_LONG)) { goto overflowBasic; } wResult = w1 * w2; diff --git a/generic/tclNotify.c b/generic/tclNotify.c index 3dbc58b..1d750c4 100644 --- a/generic/tclNotify.c +++ b/generic/tclNotify.c @@ -1040,7 +1040,7 @@ Tcl_ServiceAll(void) } /* - * We need to turn off event servicing like we to in Tcl_DoOneEvent, to + * We need to turn off event servicing like we do in Tcl_DoOneEvent, to * avoid recursive calls. */ diff --git a/generic/tclOO.c b/generic/tclOO.c index 4efdd9e..86c4087 100644 --- a/generic/tclOO.c +++ b/generic/tclOO.c @@ -403,7 +403,7 @@ InitFoundation( fPtr->objectCls = TclOOAllocClass(interp, AllocObject(interp, "object", (Namespace *)fPtr->ooNs, NULL)); /* - * Corresponding TclOODecrRefCount in KillFoudation. + * Corresponding TclOODecrRefCount in KillFoundation. */ AddRef(fPtr->objectCls->thisPtr); @@ -429,7 +429,7 @@ InitFoundation( AllocObject(interp, "class", (Namespace *)fPtr->ooNs, NULL)); /* - * Corresponding TclOODecrRefCount in KillFoudation. + * Corresponding TclOODecrRefCount in KillFoundation. */ AddRef(fPtr->classCls->thisPtr); diff --git a/generic/tclPkg.c b/generic/tclPkg.c index ec932f1..461c343 100644 --- a/generic/tclPkg.c +++ b/generic/tclPkg.c @@ -1430,7 +1430,7 @@ CheckVersionAndConvert( int hasunstable = 0; /* * 4* assuming that each char is a separator (a,b become ' -x '). - * 4+ to have spce for an additional -2 at the end + * 4+ to have space for an additional -2 at the end */ char *ibuf = ckalloc(4 + 4*strlen(string)); char *ip = ibuf; |