Merge pull request #3751 from BsAtHome/fix_tcltk9-memleak

andypugh · web-flow · commit 0fa82fdaecb8 · 2026-01-29T15:10:37.000Z
Fix memory leak in tcl/tk 9 update due to misspelled define
diff --git a/src/emc/usr_intf/axis/extensions/togl.c b/src/emc/usr_intf/axis/extensions/togl.c
@@ -1070,7 +1070,7 @@ int Togl_Configure(Tcl_Interp *interp, struct Togl *togl,
                           argc, (void *)optr, (char *)togl, flags) == TCL_ERROR) {
       return(TCL_ERROR);
    }
-#if TK_VERSION_MAJOR >= 9
+#if TK_MAJOR_VERSION >= 9
    for(int u = 0; u < argc; u++) {
       Tcl_DecrRefCount(optr[u]);
    }

Original file line number	Diff line number	Diff line change
`@@ -1070,7 +1070,7 @@ int Togl_Configure(Tcl_Interp interp, struct Togl togl,`
`1070`	`1070`	`argc, (void )optr, (char )togl, flags) == TCL_ERROR) {`
`1071`	`1071`	`return(TCL_ERROR);`
`1072`	`1072`	`}`
`1073`		`-#if TK_VERSION_MAJOR >= 9`
	`1073`	`+#if TK_MAJOR_VERSION >= 9`
`1074`	`1074`	`for(int u = 0; u < argc; u++) {`
`1075`	`1075`	`Tcl_DecrRefCount(optr[u]);`
`1076`	`1076`	`}`