From 8fda4dd37512f41e1e7b277e11b450cd7185d5ed Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sun, 15 Oct 2023 11:51:54 +0000 Subject: Fix [26870862f0]: Wrong sentinel in Tcl_SetErrorCode usage --- generic/tclAssembly.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c index e69348c..2e5709a 100644 --- a/generic/tclAssembly.c +++ b/generic/tclAssembly.c @@ -2011,7 +2011,7 @@ CreateMirrorJumpTable( Tcl_SetObjResult(interp, Tcl_ObjPrintf( "duplicate entry in jump table for \"%s\"", Tcl_GetString(objv[i]))); - Tcl_SetErrorCode(interp, "TCL", "ASSEM", "DUPJUMPTABLEENTRY"); + Tcl_SetErrorCode(interp, "TCL", "ASSEM", "DUPJUMPTABLEENTRY", NULL); DeleteMirrorJumpTable(jtPtr); return TCL_ERROR; } @@ -3451,7 +3451,7 @@ StackCheckBasicBlock( if (assemEnvPtr->flags & TCL_EVAL_DIRECT) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "code pops stack below level of enclosing catch", -1)); - Tcl_SetErrorCode(interp, "TCL", "ASSEM", "BADSTACKINCATCH", -1); + Tcl_SetErrorCode(interp, "TCL", "ASSEM", "BADSTACKINCATCH", NULL); AddBasicBlockRangeToErrorInfo(assemEnvPtr, blockPtr); Tcl_SetErrorLine(interp, blockPtr->startLine); } -- cgit v0.12 From 7ab31a033508f2d3cc00bdbe28aef55c188f52cd Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sun, 15 Oct 2023 21:47:03 +0000 Subject: C++ doesn't accept "register" keyword --- compat/zlib/contrib/minizip/crypt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/zlib/contrib/minizip/crypt.h b/compat/zlib/contrib/minizip/crypt.h index f4b93b7..8bde464 100644 --- a/compat/zlib/contrib/minizip/crypt.h +++ b/compat/zlib/contrib/minizip/crypt.h @@ -50,7 +50,7 @@ static int update_keys(unsigned long* pkeys, const z_crc_t* pcrc_32_tab, int c) (*(pkeys+1)) += (*(pkeys+0)) & 0xff; (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1; { - register int keyshift = (int)((*(pkeys+1)) >> 24); + int keyshift = (int)((*(pkeys+1)) >> 24); (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift); } return c; -- cgit v0.12