--- tcl/tcl_env.c.orig	Fri Jun 22 00:28:47 2007
+++ tcl/tcl_env.c	Sat Sep 15 12:39:57 2007
@@ -261,7 +261,7 @@ env_Cmd(clientData, interp, objc, objv)
 	 * Get the command name index from the object based on the berkdbcmds
 	 * defined above.
 	 */
-	if (Tcl_GetIndexFromObj(interp, objv[1], envcmds, "command",
+	if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)envcmds, "command",
 	    TCL_EXACT, &cmdindex) != TCL_OK)
 		return (IS_HELP(objv[1]));
 	res = NULL;
@@ -963,7 +963,7 @@ tcl_EnvRemove(interp, objc, objv, dbenv, envip)
 
 	i = 2;
 	while (i < objc) {
-		if (Tcl_GetIndexFromObj(interp, objv[i], envremopts, "option",
+		if (Tcl_GetIndexFromObj(interp, objv[i], (CONST84 char **)envremopts, "option",
 		    TCL_EXACT, &optindex) != TCL_OK) {
 			result = IS_HELP(objv[i]);
 			goto error;
@@ -1353,7 +1353,7 @@ tcl_EnvVerbose(interp, dbenv, which, onoff)
 	int on, optindex, ret;
 	u_int32_t wh;
 
-	if (Tcl_GetIndexFromObj(interp, which, verbwhich, "option",
+	if (Tcl_GetIndexFromObj(interp, which, (CONST84 char **)verbwhich, "option",
 	    TCL_EXACT, &optindex) != TCL_OK)
 		return (IS_HELP(which));
 
@@ -1382,7 +1382,7 @@ tcl_EnvVerbose(interp, dbenv, which, onoff)
 	default:
 		return (TCL_ERROR);
 	}
-	if (Tcl_GetIndexFromObj(interp, onoff, verbonoff, "option",
+	if (Tcl_GetIndexFromObj(interp, onoff, (CONST84 char **)verbonoff, "option",
 	    TCL_EXACT, &optindex) != TCL_OK)
 		return (IS_HELP(onoff));
 	switch ((enum verbonoff)optindex) {
@@ -1740,7 +1740,7 @@ tcl_EnvTest(interp, objc, objv, dbenv)
 	/*
 	 * This must be the "check", "copy" or "abort" portion of the command.
 	 */
-	if (Tcl_GetIndexFromObj(interp, objv[2], envtestcmd, "command",
+	if (Tcl_GetIndexFromObj(interp, objv[2], (CONST84 char **)envtestcmd, "command",
 	    TCL_EXACT, &optindex) != TCL_OK) {
 		result = IS_HELP(objv[2]);
 		return (result);
@@ -1780,7 +1780,7 @@ tcl_EnvTest(interp, objc, objv, dbenv)
 	/*
 	 * This must be the location portion of the command.
 	 */
-	if (Tcl_GetIndexFromObj(interp, objv[3], envtestat, "location",
+	if (Tcl_GetIndexFromObj(interp, objv[3], (CONST84 char **)envtestat, "location",
 	    TCL_EXACT, &optindex) != TCL_OK) {
 		result = IS_HELP(objv[3]);
 		return (result);
@@ -1883,7 +1883,7 @@ env_DbRemove(interp, objc, objv, dbenv)
 	 */
 	i = 2;
 	while (i < objc) {
-		if (Tcl_GetIndexFromObj(interp, objv[i], envdbrem,
+		if (Tcl_GetIndexFromObj(interp, objv[i], (CONST84 char **)envdbrem,
 		    "option", TCL_EXACT, &optindex) != TCL_OK) {
 			arg = Tcl_GetStringFromObj(objv[i], NULL);
 			if (arg[0] == '-') {
@@ -2014,7 +2014,7 @@ env_DbRename(interp, objc, objv, dbenv)
 	 */
 	i = 2;
 	while (i < objc) {
-		if (Tcl_GetIndexFromObj(interp, objv[i], envdbmv,
+		if (Tcl_GetIndexFromObj(interp, objv[i], (CONST84 char **)envdbmv,
 		    "option", TCL_EXACT, &optindex) != TCL_OK) {
 			arg = Tcl_GetStringFromObj(objv[i], NULL);
 			if (arg[0] == '-') {
