summaryrefslogtreecommitdiffstats
path: root/generic/tkConsole.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-24 14:00:22 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-24 14:00:22 (GMT)
commitb744234ad43b7dc3544f0184e2b76d9f28137551 (patch)
tree00c1f2568bb436b660acd8ed3b863b86b96cf086 /generic/tkConsole.c
parentc8bf7eaf6e7d5dbcf3c5ee48102077d9579e1de2 (diff)
parentbbbc32416a291c8abda4072bafa9579418034907 (diff)
downloadtk-b744234ad43b7dc3544f0184e2b76d9f28137551.zip
tk-b744234ad43b7dc3544f0184e2b76d9f28137551.tar.gz
tk-b744234ad43b7dc3544f0184e2b76d9f28137551.tar.bz2
Merge core-8-5-branch
Various Tcl_GetIndexFromObj -> Tcl_GetIndexFromObjStruct changes.
Diffstat (limited to 'generic/tkConsole.c')
-rw-r--r--generic/tkConsole.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index 684c9aa..b78b6aa 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.c
@@ -697,8 +697,8 @@ ConsoleObjCmd(
Tcl_WrongNumArgs(interp, 1, objv, "option ?arg?");
return TCL_ERROR;
}
- if (Tcl_GetIndexFromObj(interp, objv[1], options, "option", 0, &index)
- != TCL_OK) {
+ if (Tcl_GetIndexFromObjStruct(interp, objv[1], options,
+ sizeof(char), "option", 0, &index) != TCL_OK) {
return TCL_ERROR;
}
@@ -787,8 +787,8 @@ InterpreterObjCmd(
Tcl_WrongNumArgs(interp, 1, objv, "option arg");
return TCL_ERROR;
}
- if (Tcl_GetIndexFromObj(interp, objv[1], options, "option", 0, &index)
- != TCL_OK) {
+ if (Tcl_GetIndexFromObjStruct(interp, objv[1], options,
+ sizeof(char), "option", 0, &index) != TCL_OK) {
return TCL_ERROR;
}