Backport formatting from 9.0. Revise genStubs.tcl such that dummy entries are only generated for Tcl 8.x, not for 9.0

12 files changed, 228 insertions, 228 deletions

diff --git a/generic/tclTest.c b/generic/tclTest.c
index ddc6024..007d51a 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -879,7 +879,7 @@ TestasyncCmd(
 
     if (argc < 2) {
 	wrongNumArgs:
-	Tcl_AppendResult(interp, "wrong # args", (void *)NULL);
+	Tcl_AppendResult(interp, "wrong # args", (char *)NULL);
 	return TCL_ERROR;
     }
     if (strcmp(argv[1], "create") == 0) {
@@ -967,7 +967,7 @@ TestasyncCmd(
 		if (Tcl_CreateThread(&threadID, AsyncThreadProc,
 			INT2PTR(id), TCL_THREAD_STACK_DEFAULT,
 			TCL_THREAD_NOFLAGS) != TCL_OK) {
-		    Tcl_AppendResult(interp, "can't create thread", (void *)NULL);
+		    Tcl_AppendResult(interp, "can't create thread", (char *)NULL);
 		    Tcl_MutexUnlock(&asyncTestMutex);
 		    return TCL_ERROR;
 		}
@@ -977,7 +977,7 @@ TestasyncCmd(
 	Tcl_MutexUnlock(&asyncTestMutex);
     } else {
 	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": must be create, delete, int, mark, or marklater", (void *)NULL);
+		"\": must be create, delete, int, mark, or marklater", (char *)NULL);
 	return TCL_ERROR;
     }
     return TCL_OK;
@@ -1137,34 +1137,34 @@ TestcmdinfoObjCmd(
 	break;
     case CMDINFO_GET:
 	if (Tcl_GetCommandInfo(interp, Tcl_GetString(objv[2]), &info) ==0) {
-	    Tcl_AppendResult(interp, "??", (void *)NULL);
+	    Tcl_AppendResult(interp, "??", (char *)NULL);
 	    return TCL_OK;
 	}
 	if (info.proc == CmdProc1) {
 	    Tcl_AppendResult(interp, "CmdProc1", " ",
-		    (char *) info.clientData, (void *)NULL);
+		    (char *) info.clientData, (char *)NULL);
 	} else if (info.proc == CmdProc2) {
 	    Tcl_AppendResult(interp, "CmdProc2", " ",
-		    (char *) info.clientData, (void *)NULL);
+		    (char *) info.clientData, (char *)NULL);
 	} else {
-	    Tcl_AppendResult(interp, "unknown", (void *)NULL);
+	    Tcl_AppendResult(interp, "unknown", (char *)NULL);
 	}
 	if (info.deleteProc == CmdDelProc1) {
 	    Tcl_AppendResult(interp, " CmdDelProc1", " ",
-		    (char *) info.deleteData, (void *)NULL);
+		    (char *) info.deleteData, (char *)NULL);
 	} else if (info.deleteProc == CmdDelProc2) {
 	    Tcl_AppendResult(interp, " CmdDelProc2", " ",
-		    (char *) info.deleteData, (void *)NULL);
+		    (char *) info.deleteData, (char *)NULL);
 	} else {
-	    Tcl_AppendResult(interp, " unknown", (void *)NULL);
+	    Tcl_AppendResult(interp, " unknown", (char *)NULL);
 	}
-	Tcl_AppendResult(interp, " ", info.namespacePtr->fullName, (void *)NULL);
+	Tcl_AppendResult(interp, " ", info.namespacePtr->fullName, (char *)NULL);
 	if (info.isNativeObjectProc == 0) {
-	    Tcl_AppendResult(interp, " stringProc", (void *)NULL);
+	    Tcl_AppendResult(interp, " stringProc", (char *)NULL);
 	} else if (info.isNativeObjectProc == 1) {
-	    Tcl_AppendResult(interp, " nativeObjectProc", (void *)NULL);
+	    Tcl_AppendResult(interp, " nativeObjectProc", (char *)NULL);
 	} else if (info.isNativeObjectProc == 2) {
-	    Tcl_AppendResult(interp, " nativeObjectProc2", (void *)NULL);
+	    Tcl_AppendResult(interp, " nativeObjectProc2", (char *)NULL);
 	} else {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf("Invalid isNativeObjectProc value %d",
 		    info.isNativeObjectProc));
@@ -1200,7 +1200,7 @@ CmdProc0(
     TCL_UNUSED(const char **) /*argv*/)
 {
     TestCommandTokenRef *refPtr = (TestCommandTokenRef *) clientData;
-    Tcl_AppendResult(interp, "CmdProc1 ", refPtr->value, (void *)NULL);
+    Tcl_AppendResult(interp, "CmdProc1 ", refPtr->value, (char *)NULL);
     return TCL_OK;
 }
 
@@ -1211,7 +1211,7 @@ CmdProc1(
     TCL_UNUSED(int) /*argc*/,
     TCL_UNUSED(const char **) /*argv*/)
 {
-    Tcl_AppendResult(interp, "CmdProc1 ", (char *) clientData, (void *)NULL);
+    Tcl_AppendResult(interp, "CmdProc1 ", (char *) clientData, (char *)NULL);
     return TCL_OK;
 }
 
@@ -1222,7 +1222,7 @@ CmdProc2(
     TCL_UNUSED(int) /*argc*/,
     TCL_UNUSED(const char **) /*argv*/)
 {
-    Tcl_AppendResult(interp, "CmdProc2 ", (char *) clientData, (void *)NULL);
+    Tcl_AppendResult(interp, "CmdProc2 ", (char *) clientData, (char *)NULL);
     return TCL_OK;
 }
 
@@ -1296,7 +1296,7 @@ TestcmdtokenCmd(
 
     if (argc != 3) {
 	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" option arg\"", (void *)NULL);
+		" option arg\"", (char *)NULL);
 	return TCL_ERROR;
     }
     if (strcmp(argv[1], "create") == 0) {
@@ -1309,11 +1309,11 @@ TestcmdtokenCmd(
 	refPtr->nextPtr = firstCommandTokenRef;
 	firstCommandTokenRef = refPtr;
 	snprintf(buf, sizeof(buf), "%d", refPtr->id);
-	Tcl_AppendResult(interp, buf, (void *)NULL);
+	Tcl_AppendResult(interp, buf, (char *)NULL);
     } else {
 	if (sscanf(argv[2], "%d", &id) != 1) {
 	    Tcl_AppendResult(interp, "bad command token \"", argv[2],
-		    "\"", (void *)NULL);
+		    "\"", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
@@ -1326,7 +1326,7 @@ TestcmdtokenCmd(
 
 	if (refPtr == NULL) {
 	    Tcl_AppendResult(interp, "bad command token \"", argv[2],
-		    "\"", (void *)NULL);
+		    "\"", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
@@ -1342,7 +1342,7 @@ TestcmdtokenCmd(
 	    Tcl_DecrRefCount(objPtr);
 	} else {
 	    Tcl_AppendResult(interp, "bad option \"", argv[1],
-		    "\": must be create, name, or free", (void *)NULL);
+		    "\": must be create, name, or free", (char *)NULL);
 	    return TCL_ERROR;
 	}
     }
@@ -1380,7 +1380,7 @@ TestcmdtraceCmd(
 
     if (argc != 3) {
 	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" option script\"", (void *)NULL);
+		" option script\"", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -1390,7 +1390,7 @@ TestcmdtraceCmd(
 	result = Tcl_EvalEx(interp, argv[2], TCL_INDEX_NONE, 0);
 	if (result == TCL_OK) {
 	    Tcl_ResetResult(interp);
-	    Tcl_AppendResult(interp, Tcl_DStringValue(&buffer), (void *)NULL);
+	    Tcl_AppendResult(interp, Tcl_DStringValue(&buffer), (char *)NULL);
 	}
 	Tcl_DeleteTrace(interp, cmdTrace);
 	Tcl_DStringFree(&buffer);
@@ -1412,7 +1412,7 @@ TestcmdtraceCmd(
 	result = Tcl_EvalEx(interp, argv[2], TCL_INDEX_NONE, 0);
 	if (result == TCL_OK) {
 	    Tcl_ResetResult(interp);
-	    Tcl_AppendResult(interp, Tcl_DStringValue(&buffer), (void *)NULL);
+	    Tcl_AppendResult(interp, Tcl_DStringValue(&buffer), (char *)NULL);
 	}
 	Tcl_DeleteTrace(interp, cmdTrace);
 	Tcl_DStringFree(&buffer);
@@ -1430,7 +1430,7 @@ TestcmdtraceCmd(
 	result = Tcl_EvalEx(interp, argv[2], TCL_INDEX_NONE, 0);
 	Tcl_DeleteTrace(interp, cmdTrace);
 	if (!deleteCalled) {
-	    Tcl_AppendResult(interp, "Delete wasn't called", (void *)NULL);
+	    Tcl_AppendResult(interp, "Delete wasn't called", (char *)NULL);
 	    return TCL_ERROR;
 	} else {
 	    return result;
@@ -1444,14 +1444,14 @@ TestcmdtraceCmd(
 	result = Tcl_EvalEx(interp, argv[2], TCL_INDEX_NONE, 0);
 	if (result == TCL_OK) {
 	    Tcl_ResetResult(interp);
-	    Tcl_AppendResult(interp, Tcl_DStringValue(&buffer), (void *)NULL);
+	    Tcl_AppendResult(interp, Tcl_DStringValue(&buffer), (char *)NULL);
 	}
 	Tcl_DeleteTrace(interp, t2);
 	Tcl_DeleteTrace(interp, t1);
 	Tcl_DStringFree(&buffer);
     } else {
 	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": must be tracetest, deletetest, doubletest or resulttest", (void *)NULL);
+		"\": must be tracetest, deletetest, doubletest or resulttest", (char *)NULL);
 	return TCL_ERROR;
     }
     return TCL_OK;
@@ -1569,7 +1569,7 @@ TestcreatecommandCmd(
 {
     if (argc != 2) {
 	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" option\"", (void *)NULL);
+		" option\"", (char *)NULL);
 	return TCL_ERROR;
     }
     if (strcmp(argv[1], "create") == 0) {
@@ -1584,7 +1584,7 @@ TestcreatecommandCmd(
 	Tcl_DeleteCommand(interp, "value:at:");
     } else {
 	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": must be create, delete, create2, or delete2", (void *)NULL);
+		"\": must be create, delete, create2, or delete2", (char *)NULL);
 	return TCL_ERROR;
     }
     return TCL_OK;
@@ -1604,11 +1604,11 @@ CreatedCommandProc(
 	    &info);
     if (!found) {
 	Tcl_AppendResult(interp, "CreatedCommandProc could not get command info for test_ns_basic::createdcommand",
-		(void *)NULL);
+		(char *)NULL);
 	return TCL_ERROR;
     }
     Tcl_AppendResult(interp, "CreatedCommandProc in ",
-	    info.namespacePtr->fullName, (void *)NULL);
+	    info.namespacePtr->fullName, (char *)NULL);
     return TCL_OK;
 }
 
@@ -1625,11 +1625,11 @@ CreatedCommandProc2(
     found = Tcl_GetCommandInfo(interp, "value:at:", &info);
     if (!found) {
 	Tcl_AppendResult(interp, "CreatedCommandProc2 could not get command info for test_ns_basic::createdcommand",
-		(void *)NULL);
+		(char *)NULL);
 	return TCL_ERROR;
     }
     Tcl_AppendResult(interp, "CreatedCommandProc2 in ",
-	    info.namespacePtr->fullName, (void *)NULL);
+	    info.namespacePtr->fullName, (char *)NULL);
     return TCL_OK;
 }
 
@@ -1725,7 +1725,7 @@ TestdelCmd(
     Tcl_Interp *child;
 
     if (argc != 4) {
-	Tcl_AppendResult(interp, "wrong # args", (void *)NULL);
+	Tcl_AppendResult(interp, "wrong # args", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -1753,7 +1753,7 @@ DelCmdProc(
 {
     DelCmd *dPtr = (DelCmd *) clientData;
 
-    Tcl_AppendResult(interp, dPtr->deleteCmd, (void *)NULL);
+    Tcl_AppendResult(interp, dPtr->deleteCmd, (char *)NULL);
     ckfree(dPtr->deleteCmd);
     ckfree(dPtr);
     return TCL_OK;
@@ -1798,7 +1798,7 @@ TestdelassocdataCmd(
 {
     if (argc != 2) {
 	Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-		" data_key\"", (void *)NULL);
+		" data_key\"", (char *)NULL);
 	return TCL_ERROR;
     }
     Tcl_DeleteAssocData(interp, argv[1]);
@@ -1924,7 +1924,7 @@ TestdstringCmd(
 
     if (argc < 2) {
 	wrongNumArgs:
-	Tcl_AppendResult(interp, "wrong # args", (void *)NULL);
+	Tcl_AppendResult(interp, "wrong # args", (char *)NULL);
 	return TCL_ERROR;
     }
     if (strcmp(argv[1], "append") == 0) {
@@ -1960,9 +1960,9 @@ TestdstringCmd(
 	    goto wrongNumArgs;
 	}
 	if (strcmp(argv[2], "staticsmall") == 0) {
-	    Tcl_AppendResult(interp, "short", (void *)NULL);
+	    Tcl_AppendResult(interp, "short", (char *)NULL);
 	} else if (strcmp(argv[2], "staticlarge") == 0) {
-	    Tcl_AppendResult(interp, "first0 first1 first2 first3 first4 first5 first6 first7 first8 first9\nsecond0 second1 second2 second3 second4 second5 second6 second7 second8 second9\nthird0 third1 third2 third3 third4 third5 third6 third7 third8 third9\nfourth0 fourth1 fourth2 fourth3 fourth4 fourth5 fourth6 fourth7 fourth8 fourth9\nfifth0 fifth1 fifth2 fifth3 fifth4 fifth5 fifth6 fifth7 fifth8 fifth9\nsixth0 sixth1 sixth2 sixth3 sixth4 sixth5 sixth6 sixth7 sixth8 sixth9\nseventh0 seventh1 seventh2 seventh3 seventh4 seventh5 seventh6 seventh7 seventh8 seventh9\n", (void *)NULL);
+	    Tcl_AppendResult(interp, "first0 first1 first2 first3 first4 first5 first6 first7 first8 first9\nsecond0 second1 second2 second3 second4 second5 second6 second7 second8 second9\nthird0 third1 third2 third3 third4 third5 third6 third7 third8 third9\nfourth0 fourth1 fourth2 fourth3 fourth4 fourth5 fourth6 fourth7 fourth8 fourth9\nfifth0 fifth1 fifth2 fifth3 fifth4 fifth5 fifth6 fifth7 fifth8 fifth9\nsixth0 sixth1 sixth2 sixth3 sixth4 sixth5 sixth6 sixth7 sixth8 sixth9\nseventh0 seventh1 seventh2 seventh3 seventh4 seventh5 seventh6 seventh7 seventh8 seventh9\n", (char *)NULL);
 	} else if (strcmp(argv[2], "free") == 0) {
 	    char *s = (char *)ckalloc(100);
 	    strcpy(s, "This is a malloc-ed string");
@@ -1974,7 +1974,7 @@ TestdstringCmd(
 	} else {
 	    Tcl_AppendResult(interp, "bad gresult option \"", argv[2],
 		    "\": must be staticsmall, staticlarge, free, or special",
-		    (void *)NULL);
+		    (char *)NULL);
 	    return TCL_ERROR;
 	}
 	Tcl_DStringGetResult(interp, &dstring);
@@ -2010,7 +2010,7 @@ TestdstringCmd(
     } else {
 	Tcl_AppendResult(interp, "bad option \"", argv[1],
 		"\": must be append, element, end, free, get, gresult, length, "
-		"result, start, toobj, or trunc", (void *)NULL);
+		"result, start, toobj, or trunc", (char *)NULL);
 	return TCL_ERROR;
     }
     return TCL_OK;
@@ -2466,7 +2466,7 @@ TestevalexObjCmd(
 	const char *global = Tcl_GetString(objv[2]);
 	if (strcmp(global, "global") != 0) {
 	    Tcl_AppendResult(interp, "bad value \"", global,
-		    "\": must be global", (void *)NULL);
+		    "\": must be global", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	flags = TCL_EVAL_GLOBAL;
@@ -2735,7 +2735,7 @@ TestexithandlerCmd(
 
     if (argc != 3) {
 	Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-		" create|delete value\"", (void *)NULL);
+		" create|delete value\"", (char *)NULL);
 	return TCL_ERROR;
     }
     if (Tcl_GetInt(interp, argv[2], &value) != TCL_OK) {
@@ -2749,7 +2749,7 @@ TestexithandlerCmd(
 		INT2PTR(value));
     } else {
 	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": must be create or delete", (void *)NULL);
+		"\": must be create or delete", (char *)NULL);
 	return TCL_ERROR;
     }
     return TCL_OK;
@@ -2813,16 +2813,16 @@ TestexprlongCmd(
 
     if (argc != 2) {
 	Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-		" expression\"", (void *)NULL);
+		" expression\"", (char *)NULL);
 	return TCL_ERROR;
     }
-    Tcl_AppendResult(interp, "This is a result", (void *)NULL);
+    Tcl_AppendResult(interp, "This is a result", (char *)NULL);
     result = Tcl_ExprLong(interp, argv[1], &exprResult);
     if (result != TCL_OK) {
 	return result;
     }
     snprintf(buf, sizeof(buf), ": %ld", exprResult);
-    Tcl_AppendResult(interp, buf, (void *)NULL);
+    Tcl_AppendResult(interp, buf, (char *)NULL);
     return TCL_OK;
 }
 
@@ -2858,13 +2858,13 @@ TestexprlongobjCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "expression");
 	return TCL_ERROR;
     }
-    Tcl_AppendResult(interp, "This is a result", (void *)NULL);
+    Tcl_AppendResult(interp, "This is a result", (char *)NULL);
     result = Tcl_ExprLongObj(interp, objv[1], &exprResult);
     if (result != TCL_OK) {
 	return result;
     }
     snprintf(buf, sizeof(buf), ": %ld", exprResult);
-    Tcl_AppendResult(interp, buf, (void *)NULL);
+    Tcl_AppendResult(interp, buf, (char *)NULL);
     return TCL_OK;
 }
 
@@ -2898,17 +2898,17 @@ TestexprdoubleCmd(
 
     if (argc != 2) {
 	Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-		" expression\"", (void *)NULL);
+		" expression\"", (char *)NULL);
 	return TCL_ERROR;
     }
-    Tcl_AppendResult(interp, "This is a result", (void *)NULL);
+    Tcl_AppendResult(interp, "This is a result", (char *)NULL);
     result = Tcl_ExprDouble(interp, argv[1], &exprResult);
     if (result != TCL_OK) {
 	return result;
     }
     strcpy(buf, ": ");
     Tcl_PrintDouble(interp, exprResult, buf+2);
-    Tcl_AppendResult(interp, buf, (void *)NULL);
+    Tcl_AppendResult(interp, buf, (char *)NULL);
     return TCL_OK;
 }
 
@@ -2944,14 +2944,14 @@ TestexprdoubleobjCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "expression");
 	return TCL_ERROR;
     }
-    Tcl_AppendResult(interp, "This is a result", (void *)NULL);
+    Tcl_AppendResult(interp, "This is a result", (char *)NULL);
     result = Tcl_ExprDoubleObj(interp, objv[1], &exprResult);
     if (result != TCL_OK) {
 	return result;
     }
     strcpy(buf, ": ");
     Tcl_PrintDouble(interp, exprResult, buf+2);
-    Tcl_AppendResult(interp, buf, (void *)NULL);
+    Tcl_AppendResult(interp, buf, (char *)NULL);
     return TCL_OK;
 }
 
@@ -2980,7 +2980,7 @@ TestexprstringCmd(
 {
     if (argc != 2) {
 	Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-		" expression\"", (void *)NULL);
+		" expression\"", (char *)NULL);
 	return TCL_ERROR;
     }
     return Tcl_ExprString(interp, argv[1]);
@@ -3029,7 +3029,7 @@ TestfilelinkCmd(
 	    Tcl_AppendResult(interp, "could not create link from \"",
 		    Tcl_GetString(objv[1]), "\" to \"",
 		    Tcl_GetString(objv[2]), "\": ",
-		    Tcl_PosixError(interp), (void *)NULL);
+		    Tcl_PosixError(interp), (char *)NULL);
 	    return TCL_ERROR;
 	}
     } else {
@@ -3038,7 +3038,7 @@ TestfilelinkCmd(
 	if (contents == NULL) {
 	    Tcl_AppendResult(interp, "could not read link \"",
 		    Tcl_GetString(objv[1]), "\": ",
-		    Tcl_PosixError(interp), (void *)NULL);
+		    Tcl_PosixError(interp), (char *)NULL);
 	    return TCL_ERROR;
 	}
     }
@@ -3081,12 +3081,12 @@ TestgetassocdataCmd(
 
     if (argc != 2) {
 	Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-		" data_key\"", (void *)NULL);
+		" data_key\"", (char *)NULL);
 	return TCL_ERROR;
     }
     res = (char *) Tcl_GetAssocData(interp, argv[1], NULL);
     if (res != NULL) {
-	Tcl_AppendResult(interp, res, (void *)NULL);
+	Tcl_AppendResult(interp, res, (char *)NULL);
     }
     return TCL_OK;
 }
@@ -3122,11 +3122,11 @@ TestgetplatformCmd(
 
     if (argc != 1) {
 	Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-		(void *)NULL);
+		(char *)NULL);
 	return TCL_ERROR;
     }
 
-    Tcl_AppendResult(interp, platformStrings[*platform], (void *)NULL);
+    Tcl_AppendResult(interp, platformStrings[*platform], (char *)NULL);
     return TCL_OK;
 }
 
@@ -3159,7 +3159,7 @@ TestinterpdeleteCmd(
 
     if (argc != 2) {
 	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" path\"", (void *)NULL);
+		" path\"", (char *)NULL);
 	return TCL_ERROR;
     }
     childToDelete = Tcl_GetChild(interp, argv[1]);
@@ -3217,7 +3217,7 @@ TestlinkCmd(
     if (argc < 2) {
 	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
 		" option ?arg arg arg arg arg arg arg arg arg arg arg arg"
-		" arg arg?\"", (void *)NULL);
+		" arg arg?\"", (char *)NULL);
 	return TCL_ERROR;
     }
     if (strcmp(argv[1], "create") == 0) {
@@ -3225,7 +3225,7 @@ TestlinkCmd(
 	    Tcl_AppendResult(interp, "wrong # args: should be \"",
 		argv[0], " ", argv[1],
 		" intRO realRO boolRO stringRO wideRO charRO ucharRO shortRO"
-		" ushortRO uintRO longRO ulongRO floatRO uwideRO\"", (void *)NULL);
+		" ushortRO uintRO longRO ulongRO floatRO uwideRO\"", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	if (created) {
@@ -3434,7 +3434,7 @@ TestlinkCmd(
 		    argv[0], " ", argv[1],
 		    " intValue realValue boolValue stringValue wideValue"
 		    " charValue ucharValue shortValue ushortValue uintValue"
-		    " longValue ulongValue floatValue uwideValue\"", (void *)NULL);
+		    " longValue ulongValue floatValue uwideValue\"", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	if (argv[2][0] != 0) {
@@ -3538,7 +3538,7 @@ TestlinkCmd(
 		    argv[0], " ", argv[1],
 		    " intValue realValue boolValue stringValue wideValue"
 		    " charValue ucharValue shortValue ushortValue uintValue"
-		    " longValue ulongValue floatValue uwideValue\"", (void *)NULL);
+		    " longValue ulongValue floatValue uwideValue\"", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	if (argv[2][0] != 0) {
@@ -3650,7 +3650,7 @@ TestlinkCmd(
 	}
     } else {
 	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": should be create, delete, get, set, or update", (void *)NULL);
+		"\": should be create, delete, get, set, or update", (char *)NULL);
 	return TCL_ERROR;
     }
     return TCL_OK;
@@ -3849,7 +3849,7 @@ TestlistrepCmd(
 	    }
 	    resultObj = TclListTestObj(length, leadSpace, endSpace);
 	    if (resultObj == NULL) {
-		Tcl_AppendResult(interp, "List capacity exceeded", (void *)NULL);
+		Tcl_AppendResult(interp, "List capacity exceeded", (char *)NULL);
 		return TCL_ERROR;
 	    }
 	}
@@ -4545,7 +4545,7 @@ TestregexpObjCmd(
 	    value = Tcl_SetVar2(interp, varName, NULL, resinfo, 0);
 	    if (value == NULL) {
 		Tcl_AppendResult(interp, "couldn't set variable \"",
-			varName, "\"", (void *)NULL);
+			varName, "\"", (char *)NULL);
 		return TCL_ERROR;
 	    }
 	} else if (cflags & TCL_REG_CANMATCH) {
@@ -4559,7 +4559,7 @@ TestregexpObjCmd(
 	    value = Tcl_SetVar2(interp, varName, NULL, resinfo, 0);
 	    if (value == NULL) {
 		Tcl_AppendResult(interp, "couldn't set variable \"",
-			varName, "\"", (void *)NULL);
+			varName, "\"", (char *)NULL);
 		return TCL_ERROR;
 	    }
 	}
@@ -4780,7 +4780,7 @@ TestsetassocdataCmd(
 
     if (argc != 3) {
 	Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-		" data_key data_item\"", (void *)NULL);
+		" data_key data_item\"", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -4833,7 +4833,7 @@ TestsetplatformCmd(
 
     if (argc != 2) {
 	Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-		" platform\"", (void *)NULL);
+		" platform\"", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -4844,7 +4844,7 @@ TestsetplatformCmd(
 	*platform = TCL_PLATFORM_WINDOWS;
     } else {
 	Tcl_AppendResult(interp, "unsupported platform: should be one of "
-		"unix, or windows", (void *)NULL);
+		"unix, or windows", (char *)NULL);
 	return TCL_ERROR;
     }
     return TCL_OK;
@@ -4879,7 +4879,7 @@ TeststaticlibraryCmd(
 
     if (argc != 4) {
 	Tcl_AppendResult(interp, "wrong # arguments: should be \"",
-		argv[0], " prefix safe loaded\"", (void *)NULL);
+		argv[0], " prefix safe loaded\"", (char *)NULL);
 	return TCL_ERROR;
     }
     if (Tcl_GetInt(interp, argv[2], &safe) != TCL_OK) {
@@ -4931,14 +4931,14 @@ TesttranslatefilenameCmd(
 
     if (argc != 2) {
 	Tcl_AppendResult(interp, "wrong # arguments: should be \"",
-		argv[0], " path\"", (void *)NULL);
+		argv[0], " path\"", (char *)NULL);
 	return TCL_ERROR;
     }
     result = Tcl_TranslateFileName(interp, argv[1], &buffer);
     if (result == NULL) {
 	return TCL_ERROR;
     }
-    Tcl_AppendResult(interp, result, (void *)NULL);
+    Tcl_AppendResult(interp, result, (char *)NULL);
     Tcl_DStringFree(&buffer);
     return TCL_OK;
 }
@@ -4971,7 +4971,7 @@ TestupvarCmd(
 
     if ((argc != 5) && (argc != 6)) {
 	Tcl_AppendResult(interp, "wrong # arguments: should be \"",
-		argv[0], " level name ?name2? dest global\"", (void *)NULL);
+		argv[0], " level name ?name2? dest global\"", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -5020,28 +5020,28 @@ TestseterrorcodeCmd(
     const char **argv)		/* Argument strings. */
 {
     if (argc > 6) {
-	Tcl_AppendResult(interp, "too many args", (void *)NULL);
+	Tcl_AppendResult(interp, "too many args", (char *)NULL);
 	return TCL_ERROR;
     }
     switch (argc) {
     case 1:
-	Tcl_SetErrorCode(interp, "NONE", (void *)NULL);
+	Tcl_SetErrorCode(interp, "NONE", (char *)NULL);
 	break;
     case 2:
-	Tcl_SetErrorCode(interp, argv[1], (void *)NULL);
+	Tcl_SetErrorCode(interp, argv[1], (char *)NULL);
 	break;
     case 3:
-	Tcl_SetErrorCode(interp, argv[1], argv[2], (void *)NULL);
+	Tcl_SetErrorCode(interp, argv[1], argv[2], (char *)NULL);
 	break;
     case 4:
-	Tcl_SetErrorCode(interp, argv[1], argv[2], argv[3], (void *)NULL);
+	Tcl_SetErrorCode(interp, argv[1], argv[2], argv[3], (char *)NULL);
 	break;
     case 5:
-	Tcl_SetErrorCode(interp, argv[1], argv[2], argv[3], argv[4], (void *)NULL);
+	Tcl_SetErrorCode(interp, argv[1], argv[2], argv[3], argv[4], (char *)NULL);
 	break;
     case 6:
 	Tcl_SetErrorCode(interp, argv[1], argv[2], argv[3], argv[4],
-		argv[5], (void *)NULL);
+		argv[5], (char *)NULL);
     }
     return TCL_ERROR;
 }
@@ -5105,13 +5105,13 @@ TestfeventCmd(
 
     if (argc < 2) {
 	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" option ?arg ...?", (void *)NULL);
+		" option ?arg ...?", (char *)NULL);
 	return TCL_ERROR;
     }
     if (strcmp(argv[1], "cmd") == 0) {
 	if (argc != 3) {
 	    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		    " cmd script", (void *)NULL);
+		    " cmd script", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	if (interp2 != NULL) {
@@ -5121,7 +5121,7 @@ TestfeventCmd(
 	} else {
 	    Tcl_AppendResult(interp,
 		    "called \"testfevent code\" before \"testfevent create\"",
-		    (void *)NULL);
+		    (char *)NULL);
 	    return TCL_ERROR;
 	}
     } else if (strcmp(argv[1], "create") == 0) {
@@ -5237,11 +5237,11 @@ TestfileCmd(
     if (result != TCL_OK) {
 	if (error != NULL) {
 	    if (Tcl_GetString(error)[0] != '\0') {
-		Tcl_AppendResult(interp, Tcl_GetString(error), " ", (void *)NULL);
+		Tcl_AppendResult(interp, Tcl_GetString(error), " ", (char *)NULL);
 	    }
 	    Tcl_DecrRefCount(error);
 	}
-	Tcl_AppendResult(interp, Tcl_ErrnoId(), (void *)NULL);
+	Tcl_AppendResult(interp, Tcl_ErrnoId(), (char *)NULL);
     }
 
   end:
@@ -5682,7 +5682,7 @@ TestsetbytearraylengthObjCmd(
 	if (obj != objv[1]) {
 	    Tcl_DecrRefCount(obj);
 	}
-	Tcl_AppendResult(interp, "expected bytes", (void *)NULL);
+	Tcl_AppendResult(interp, "expected bytes", (char *)NULL);
 	return TCL_ERROR;
     }
     Tcl_SetObjResult(interp, obj);
@@ -5730,7 +5730,7 @@ TestbytestringObjCmd(
     }
 
     if (x.m != 1) {
-	Tcl_AppendResult(interp, "Tcl_GetBytesFromObj() overwrites variable", (void *)NULL);
+	Tcl_AppendResult(interp, "Tcl_GetBytesFromObj() overwrites variable", (char *)NULL);
 	return TCL_ERROR;
     }
     Tcl_SetObjResult(interp, Tcl_NewStringObj(p, x.n));
@@ -5802,7 +5802,7 @@ TestsetCmd(
     const char *value;
 
     if (argc == 2) {
-	Tcl_AppendResult(interp, "before get", (void *)NULL);
+	Tcl_AppendResult(interp, "before get", (char *)NULL);
 	value = Tcl_GetVar2(interp, argv[1], NULL, flags);
 	if (value == NULL) {
 	    return TCL_ERROR;
@@ -5810,7 +5810,7 @@ TestsetCmd(
 	Tcl_AppendElement(interp, value);
 	return TCL_OK;
     } else if (argc == 3) {
-	Tcl_AppendResult(interp, "before set", (void *)NULL);
+	Tcl_AppendResult(interp, "before set", (char *)NULL);
 	value = Tcl_SetVar2(interp, argv[1], NULL, argv[2], flags);
 	if (value == NULL) {
 	    return TCL_ERROR;
@@ -5819,7 +5819,7 @@ TestsetCmd(
 	return TCL_OK;
     } else {
 	Tcl_AppendResult(interp, "wrong # args: should be \"",
-		argv[0], " varName ?newValue?\"", (void *)NULL);
+		argv[0], " varName ?newValue?\"", (char *)NULL);
 	return TCL_ERROR;
     }
 }
@@ -5834,7 +5834,7 @@ Testset2Cmd(
     const char *value;
 
     if (argc == 3) {
-	Tcl_AppendResult(interp, "before get", (void *)NULL);
+	Tcl_AppendResult(interp, "before get", (char *)NULL);
 	value = Tcl_GetVar2(interp, argv[1], argv[2], flags);
 	if (value == NULL) {
 	    return TCL_ERROR;
@@ -5842,7 +5842,7 @@ Testset2Cmd(
 	Tcl_AppendElement(interp, value);
 	return TCL_OK;
     } else if (argc == 4) {
-	Tcl_AppendResult(interp, "before set", (void *)NULL);
+	Tcl_AppendResult(interp, "before set", (char *)NULL);
 	value = Tcl_SetVar2(interp, argv[1], argv[2], argv[3], flags);
 	if (value == NULL) {
 	    return TCL_ERROR;
@@ -5851,7 +5851,7 @@ Testset2Cmd(
 	return TCL_OK;
     } else {
 	Tcl_AppendResult(interp, "wrong # args: should be \"",
-		argv[0], " varName elemName ?newValue?\"", (void *)NULL);
+		argv[0], " varName elemName ?newValue?\"", (char *)NULL);
 	return TCL_ERROR;
     }
 }
@@ -5912,10 +5912,10 @@ TestsaveresultCmd(
     objPtr = NULL;
     switch ((enum options) index) {
     case RESULT_SMALL:
-	Tcl_AppendResult(interp, "small result", (void *)NULL);
+	Tcl_AppendResult(interp, "small result", (char *)NULL);
 	break;
     case RESULT_APPEND:
-	Tcl_AppendResult(interp, "append result", (void *)NULL);
+	Tcl_AppendResult(interp, "append result", (char *)NULL);
 	break;
     case RESULT_FREE: {
 	char *buf = (char *)ckalloc(200);
@@ -6023,7 +6023,7 @@ TestmainthreadCmd(
 	Tcl_SetObjResult(interp, idObj);
 	return TCL_OK;
     } else {
-	Tcl_AppendResult(interp, "wrong # args", (void *)NULL);
+	Tcl_AppendResult(interp, "wrong # args", (char *)NULL);
 	return TCL_ERROR;
     }
 }
@@ -6149,7 +6149,7 @@ TestChannelCmd(
 
     if (argc < 2) {
 	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" subcommand ?additional args..?\"", (void *)NULL);
+		" subcommand ?additional args..?\"", (char *)NULL);
 	return TCL_ERROR;
     }
     cmdName = argv[1];
@@ -6232,7 +6232,7 @@ TestChannelCmd(
 
 	if (argc != 3) {
 	    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		    " cut channelName\"", (void *)NULL);
+		    " cut channelName\"", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
@@ -6255,7 +6255,7 @@ TestChannelCmd(
 	    (strncmp(cmdName, "clearchannelhandlers", len) == 0)) {
 	if (argc != 3) {
 	    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		    " clearchannelhandlers channelName\"", (void *)NULL);
+		    " clearchannelhandlers channelName\"", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	Tcl_ClearChannelHandlers(chan);
@@ -6265,7 +6265,7 @@ TestChannelCmd(
     if ((cmdName[0] == 'i') && (strncmp(cmdName, "info", len) == 0)) {
 	if (argc != 3) {
 	    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		    " info channelName\"", (void *)NULL);
+		    " info channelName\"", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	Tcl_AppendElement(interp, argv[2]);
@@ -6357,40 +6357,40 @@ TestChannelCmd(
     if ((cmdName[0] == 'i') &&
 	    (strncmp(cmdName, "inputbuffered", len) == 0)) {
 	if (argc != 3) {
-	    Tcl_AppendResult(interp, "channel name required", (void *)NULL);
+	    Tcl_AppendResult(interp, "channel name required", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	IOQueued = Tcl_InputBuffered(chan);
 	TclFormatInt(buf, IOQueued);
-	Tcl_AppendResult(interp, buf, (void *)NULL);
+	Tcl_AppendResult(interp, buf, (char *)NULL);
 	return TCL_OK;
     }
 
     if ((cmdName[0] == 'i') && (strncmp(cmdName, "isshared", len) == 0)) {
 	if (argc != 3) {
-	    Tcl_AppendResult(interp, "channel name required", (void *)NULL);
+	    Tcl_AppendResult(interp, "channel name required", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
 	TclFormatInt(buf, Tcl_IsChannelShared(chan));
-	Tcl_AppendResult(interp, buf, (void *)NULL);
+	Tcl_AppendResult(interp, buf, (char *)NULL);
 	return TCL_OK;
     }
 
     if ((cmdName[0] == 'i') && (strncmp(cmdName, "isstandard", len) == 0)) {
 	if (argc != 3) {
-	    Tcl_AppendResult(interp, "channel name required", (void *)NULL);
+	    Tcl_AppendResult(interp, "channel name required", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
 	TclFormatInt(buf, Tcl_IsStandardChannel(chan));
-	Tcl_AppendResult(interp, buf, (void *)NULL);
+	Tcl_AppendResult(interp, buf, (char *)NULL);
 	return TCL_OK;
     }
 
     if ((cmdName[0] == 'm') && (strncmp(cmdName, "mode", len) == 0)) {
 	if (argc != 3) {
-	    Tcl_AppendResult(interp, "channel name required", (void *)NULL);
+	    Tcl_AppendResult(interp, "channel name required", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
@@ -6409,7 +6409,7 @@ TestChannelCmd(
 
     if ((cmdName[0] == 'm') && (strncmp(cmdName, "maxmode", len) == 0)) {
 	if (argc != 3) {
-	    Tcl_AppendResult(interp, "channel name required", (void *)NULL);
+	    Tcl_AppendResult(interp, "channel name required", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
@@ -6428,7 +6428,7 @@ TestChannelCmd(
 
     if ((cmdName[0] == 'm') && (strncmp(cmdName, "mremove-rd", len) == 0)) {
 	if (argc != 3) {
-	    Tcl_AppendResult(interp, "channel name required", (void *)NULL);
+	    Tcl_AppendResult(interp, "channel name required", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
@@ -6437,7 +6437,7 @@ TestChannelCmd(
 
     if ((cmdName[0] == 'm') && (strncmp(cmdName, "mremove-wr", len) == 0)) {
 	if (argc != 3) {
-	    Tcl_AppendResult(interp, "channel name required", (void *)NULL);
+	    Tcl_AppendResult(interp, "channel name required", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
@@ -6446,7 +6446,7 @@ TestChannelCmd(
 
     if ((cmdName[0] == 'm') && (strncmp(cmdName, "mthread", len) == 0)) {
 	if (argc != 3) {
-	    Tcl_AppendResult(interp, "channel name required", (void *)NULL);
+	    Tcl_AppendResult(interp, "channel name required", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
@@ -6457,10 +6457,10 @@ TestChannelCmd(
 
     if ((cmdName[0] == 'n') && (strncmp(cmdName, "name", len) == 0)) {
 	if (argc != 3) {
-	    Tcl_AppendResult(interp, "channel name required", (void *)NULL);
+	    Tcl_AppendResult(interp, "channel name required", (char *)NULL);
 	    return TCL_ERROR;
 	}
-	Tcl_AppendResult(interp, statePtr->channelName, (void *)NULL);
+	Tcl_AppendResult(interp, statePtr->channelName, (char *)NULL);
 	return TCL_OK;
     }
 
@@ -6480,25 +6480,25 @@ TestChannelCmd(
     if ((cmdName[0] == 'o') &&
 	    (strncmp(cmdName, "outputbuffered", len) == 0)) {
 	if (argc != 3) {
-	    Tcl_AppendResult(interp, "channel name required", (void *)NULL);
+	    Tcl_AppendResult(interp, "channel name required", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
 	IOQueued = Tcl_OutputBuffered(chan);
 	TclFormatInt(buf, IOQueued);
-	Tcl_AppendResult(interp, buf, (void *)NULL);
+	Tcl_AppendResult(interp, buf, (char *)NULL);
 	return TCL_OK;
     }
 
     if ((cmdName[0] == 'q') &&
 	    (strncmp(cmdName, "queuedcr", len) == 0)) {
 	if (argc != 3) {
-	    Tcl_AppendResult(interp, "channel name required", (void *)NULL);
+	    Tcl_AppendResult(interp, "channel name required", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
 	Tcl_AppendResult(interp,
-		(statePtr->flags & INPUT_SAW_CR) ? "1" : "0", (void *)NULL);
+		(statePtr->flags & INPUT_SAW_CR) ? "1" : "0", (char *)NULL);
 	return TCL_OK;
     }
 
@@ -6521,12 +6521,12 @@ TestChannelCmd(
 
     if ((cmdName[0] == 'r') && (strncmp(cmdName, "refcount", len) == 0)) {
 	if (argc != 3) {
-	    Tcl_AppendResult(interp, "channel name required", (void *)NULL);
+	    Tcl_AppendResult(interp, "channel name required", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
 	TclFormatInt(buf, statePtr->refCount);
-	Tcl_AppendResult(interp, buf, (void *)NULL);
+	Tcl_AppendResult(interp, buf, (char *)NULL);
 	return TCL_OK;
     }
 
@@ -6539,7 +6539,7 @@ TestChannelCmd(
 
     if ((cmdName[0] == 's') && (strncmp(cmdName, "splice", len) == 0)) {
 	if (argc != 3) {
-	    Tcl_AppendResult(interp, "channel name required", (void *)NULL);
+	    Tcl_AppendResult(interp, "channel name required", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
@@ -6553,10 +6553,10 @@ TestChannelCmd(
 
     if ((cmdName[0] == 't') && (strncmp(cmdName, "type", len) == 0)) {
 	if (argc != 3) {
-	    Tcl_AppendResult(interp, "channel name required", (void *)NULL);
+	    Tcl_AppendResult(interp, "channel name required", (char *)NULL);
 	    return TCL_ERROR;
 	}
-	Tcl_AppendResult(interp, Tcl_ChannelName(chanPtr->typePtr), (void *)NULL);
+	Tcl_AppendResult(interp, Tcl_ChannelName(chanPtr->typePtr), (char *)NULL);
 	return TCL_OK;
     }
 
@@ -6583,12 +6583,12 @@ TestChannelCmd(
 
 	if (argc != 5) {
 	    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		    " transform channelId -command cmd\"", (void *)NULL);
+		    " transform channelId -command cmd\"", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	if (strcmp(argv[3], "-command") != 0) {
 	    Tcl_AppendResult(interp, "bad argument \"", argv[3],
-		    "\": should be \"-command\"", (void *)NULL);
+		    "\": should be \"-command\"", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
@@ -6603,7 +6603,7 @@ TestChannelCmd(
 
 	if (argc != 3) {
 	    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		    " unstack channel\"", (void *)NULL);
+		    " unstack channel\"", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	return Tcl_UnstackChannel(interp, chan);
@@ -6611,7 +6611,7 @@ TestChannelCmd(
 
     Tcl_AppendResult(interp, "bad option \"", cmdName, "\": should be "
 	    "cut, clearchannelhandlers, info, isshared, mode, open, "
-	    "readable, splice, writable, transform, unstack", (void *)NULL);
+	    "readable, splice, writable, transform, unstack", (char *)NULL);
     return TCL_ERROR;
 }
 
@@ -6648,7 +6648,7 @@ TestChannelEventCmd(
 
     if ((argc < 3) || (argc > 5)) {
 	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" channelName cmd ?arg1? ?arg2?\"", (void *)NULL);
+		" channelName cmd ?arg1? ?arg2?\"", (char *)NULL);
 	return TCL_ERROR;
     }
     chanPtr = (Channel *) Tcl_GetChannel(interp, argv[1], NULL);
@@ -6662,7 +6662,7 @@ TestChannelEventCmd(
     if ((cmd[0] == 'a') && (strncmp(cmd, "add", len) == 0)) {
 	if (argc != 5) {
 	    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		    " channelName add eventSpec script\"", (void *)NULL);
+		    " channelName add eventSpec script\"", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	if (strcmp(argv[3], "readable") == 0) {
@@ -6673,7 +6673,7 @@ TestChannelEventCmd(
 	    mask = 0;
 	} else {
 	    Tcl_AppendResult(interp, "bad event name \"", argv[3],
-		    "\": must be readable, writable, or none", (void *)NULL);
+		    "\": must be readable, writable, or none", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
@@ -6696,7 +6696,7 @@ TestChannelEventCmd(
     if ((cmd[0] == 'd') && (strncmp(cmd, "delete", len) == 0)) {
 	if (argc != 4) {
 	    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		    " channelName delete index\"", (void *)NULL);
+		    " channelName delete index\"", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	if (Tcl_GetInt(interp, argv[3], &index) == TCL_ERROR) {
@@ -6704,7 +6704,7 @@ TestChannelEventCmd(
 	}
 	if (index < 0) {
 	    Tcl_AppendResult(interp, "bad event index: ", argv[3],
-		    ": must be nonnegative", (void *)NULL);
+		    ": must be nonnegative", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	for (i = 0, esPtr = statePtr->scriptRecordPtr;
@@ -6714,7 +6714,7 @@ TestChannelEventCmd(
 	}
 	if (esPtr == NULL) {
 	    Tcl_AppendResult(interp, "bad event index ", argv[3],
-		    ": out of range", (void *)NULL);
+		    ": out of range", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	if (esPtr == statePtr->scriptRecordPtr) {
@@ -6742,7 +6742,7 @@ TestChannelEventCmd(
     if ((cmd[0] == 'l') && (strncmp(cmd, "list", len) == 0)) {
 	if (argc != 3) {
 	    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		    " channelName list\"", (void *)NULL);
+		    " channelName list\"", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	resultListPtr = Tcl_GetObjResult(interp);
@@ -6765,7 +6765,7 @@ TestChannelEventCmd(
     if ((cmd[0] == 'r') && (strncmp(cmd, "removeall", len) == 0)) {
 	if (argc != 3) {
 	    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		    " channelName removeall\"", (void *)NULL);
+		    " channelName removeall\"", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	for (esPtr = statePtr->scriptRecordPtr;
@@ -6784,7 +6784,7 @@ TestChannelEventCmd(
     if	((cmd[0] == 's') && (strncmp(cmd, "set", len) == 0)) {
 	if (argc != 5) {
 	    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		    " channelName delete index event\"", (void *)NULL);
+		    " channelName delete index event\"", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	if (Tcl_GetInt(interp, argv[3], &index) == TCL_ERROR) {
@@ -6792,7 +6792,7 @@ TestChannelEventCmd(
 	}
 	if (index < 0) {
 	    Tcl_AppendResult(interp, "bad event index: ", argv[3],
-		    ": must be nonnegative", (void *)NULL);
+		    ": must be nonnegative", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	for (i = 0, esPtr = statePtr->scriptRecordPtr;
@@ -6802,7 +6802,7 @@ TestChannelEventCmd(
 	}
 	if (esPtr == NULL) {
 	    Tcl_AppendResult(interp, "bad event index ", argv[3],
-		    ": out of range", (void *)NULL);
+		    ": out of range", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
@@ -6814,7 +6814,7 @@ TestChannelEventCmd(
 	    mask = 0;
 	} else {
 	    Tcl_AppendResult(interp, "bad event name \"", argv[4],
-		    "\": must be readable, writable, or none", (void *)NULL);
+		    "\": must be readable, writable, or none", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	esPtr->mask = mask;
@@ -6823,7 +6823,7 @@ TestChannelEventCmd(
 	return TCL_OK;
     }
     Tcl_AppendResult(interp, "bad command ", cmd, ", must be one of "
-	    "add, delete, list, set, or removeall", (void *)NULL);
+	    "add, delete, list, set, or removeall", (char *)NULL);
     return TCL_ERROR;
 }
 
@@ -6860,7 +6860,7 @@ TestSocketCmd(
 
     if (argc < 2) {
 	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" subcommand ?additional args..?\"", (void *)NULL);
+		" subcommand ?additional args..?\"", (char *)NULL);
 	return TCL_ERROR;
     }
     cmdName = argv[1];
@@ -6877,18 +6877,18 @@ TestSocketCmd(
 	 */
 	if (argc < 4) {
 	    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		    " testflags channel flags\"", (void *)NULL);
+		    " testflags channel flags\"", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	hChannel = Tcl_GetChannel(interp, argv[2], &modePtr);
 	if ( NULL == hChannel ) {
-	    Tcl_AppendResult(interp, "unknown channel:", argv[2], (void *)NULL);
+	    Tcl_AppendResult(interp, "unknown channel:", argv[2], (char *)NULL);
 	    return TCL_ERROR;
 	}
 	statePtr = (TcpState *)Tcl_GetChannelInstanceData(hChannel);
 	if ( NULL == statePtr) {
 	    Tcl_AppendResult(interp, "No channel instance data:", argv[2],
-		    (void *)NULL);
+		    (char *)NULL);
 	    return TCL_ERROR;
 	}
 	if (Tcl_GetBoolean(interp, argv[3], &testMode) != TCL_OK) {
@@ -6903,7 +6903,7 @@ TestSocketCmd(
     }
 
     Tcl_AppendResult(interp, "bad option \"", cmdName, "\": should be "
-	    "testflags", (void *)NULL);
+	    "testflags", (char *)NULL);
     return TCL_ERROR;
 }
 
@@ -6937,7 +6937,7 @@ TestServiceModeCmd(
     int newmode, oldmode;
     if (argc > 2) {
 	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-			 " ?newmode?\"", (void *)NULL);
+			 " ?newmode?\"", (char *)NULL);
 	return TCL_ERROR;
     }
     oldmode = (Tcl_GetServiceMode() != TCL_SERVICE_NONE);
@@ -6999,7 +6999,7 @@ TestWrongNumArgsObjCmd(
 	 * Asked for more arguments than were given.
 	 */
     insufArgs:
-	Tcl_AppendResult(interp, "insufficient arguments", (void *)NULL);
+	Tcl_AppendResult(interp, "insufficient arguments", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -7052,15 +7052,15 @@ TestGetIndexFromObjStructObjCmd(
 	return TCL_ERROR;
     }
     if (idx[0] != 85 || idx[2] != 85) {
-	Tcl_AppendResult(interp, "Tcl_GetIndexFromObjStruct overwrites bytes near index variable", (void *)NULL);
+	Tcl_AppendResult(interp, "Tcl_GetIndexFromObjStruct overwrites bytes near index variable", (char *)NULL);
 	return TCL_ERROR;
     } else if (idx[1] != target) {
 	char buffer[64];
 	snprintf(buffer, sizeof(buffer), "%d", idx[1]);
 	Tcl_AppendResult(interp, "index value comparison failed: got ",
-		buffer, (void *)NULL);
+		buffer, (char *)NULL);
 	snprintf(buffer, sizeof(buffer), "%d", target);
-	Tcl_AppendResult(interp, " when ", buffer, " expected", (void *)NULL);
+	Tcl_AppendResult(interp, " when ", buffer, " expected", (char *)NULL);
 	return TCL_ERROR;
     }
     Tcl_WrongNumArgs(interp, objc, objv, NULL);
@@ -7567,7 +7567,7 @@ SimpleOpenFileChannel(
     Tcl_Channel chan;
 
     if ((mode != 0) && !(mode & O_RDONLY)) {
-	Tcl_AppendResult(interp, "read-only", (void *)NULL);
+	Tcl_AppendResult(interp, "read-only", (char *)NULL);
 	return NULL;
     }
 
@@ -7653,7 +7653,7 @@ TestUtfNextCmd(
 	/* Run Tcl_UtfNext with many more possible bytes at src[-1], all should give the same result */
 	result = Tcl_UtfNext(buffer + 1);
 	if (first != result) {
-	    Tcl_AppendResult(interp, "Tcl_UtfNext is not supposed to read src[-1]", (void *)NULL);
+	    Tcl_AppendResult(interp, "Tcl_UtfNext is not supposed to read src[-1]", (char *)NULL);
 	    return TCL_ERROR;
 	}
     }
@@ -7925,7 +7925,7 @@ TestHashSystemHashCmd(
     Tcl_InitCustomHashTable(&hash, TCL_CUSTOM_TYPE_KEYS, &hkType);
 
     if (hash.numEntries != 0) {
-	Tcl_AppendResult(interp, "non-zero initial size", (void *)NULL);
+	Tcl_AppendResult(interp, "non-zero initial size", (char *)NULL);
 	Tcl_DeleteHashTable(&hash);
 	return TCL_ERROR;
     }
@@ -7942,7 +7942,7 @@ TestHashSystemHashCmd(
     }
 
     if (hash.numEntries != (Tcl_Size)limit) {
-	Tcl_AppendResult(interp, "unexpected maximal size", (void *)NULL);
+	Tcl_AppendResult(interp, "unexpected maximal size", (char *)NULL);
 	Tcl_DeleteHashTable(&hash);
 	return TCL_ERROR;
     }
@@ -7965,13 +7965,13 @@ TestHashSystemHashCmd(
     }
 
     if (hash.numEntries != 0) {
-	Tcl_AppendResult(interp, "non-zero final size", (void *)NULL);
+	Tcl_AppendResult(interp, "non-zero final size", (char *)NULL);
 	Tcl_DeleteHashTable(&hash);
 	return TCL_ERROR;
     }
 
     Tcl_DeleteHashTable(&hash);
-    Tcl_AppendResult(interp, "OK", (void *)NULL);
+    Tcl_AppendResult(interp, "OK", (char *)NULL);
     return TCL_OK;
 }
 
@@ -7987,7 +7987,7 @@ TestgetintCmd(
     const char **argv)
 {
     if (argc < 2) {
-	Tcl_AppendResult(interp, "wrong # args", (void *)NULL);
+	Tcl_AppendResult(interp, "wrong # args", (char *)NULL);
 	return TCL_ERROR;
     } else {
 	int val, i, total=0;
@@ -8014,7 +8014,7 @@ TestlongsizeCmd(
     TCL_UNUSED(const char **) /*argv*/)
 {
     if (argc != 1) {
-	Tcl_AppendResult(interp, "wrong # args", (void *)NULL);
+	Tcl_AppendResult(interp, "wrong # args", (char *)NULL);
 	return TCL_ERROR;
     }
     Tcl_SetObjResult(interp, Tcl_NewWideIntObj(sizeof(long)));
@@ -8165,21 +8165,21 @@ TestconcatobjCmd(
     if (concatPtr->refCount != 0) {
 	result = TCL_ERROR;
 	Tcl_AppendResult(interp,
-		"\n\t* (a) concatObj does not have refCount 0", (void *)NULL);
+		"\n\t* (a) concatObj does not have refCount 0", (char *)NULL);
     }
     if (concatPtr == tmpPtr) {
 	result = TCL_ERROR;
 	Tcl_AppendResult(interp, "\n\t* (a) concatObj is not a new obj ",
-		(void *)NULL);
+		(char *)NULL);
 	switch (tmpPtr->refCount) {
 	case 0:
-	    Tcl_AppendResult(interp, "(no new refCount)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(no new refCount)", (char *)NULL);
 	    break;
 	case 1:
-	    Tcl_AppendResult(interp, "(refCount added)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(refCount added)", (char *)NULL);
 	    break;
 	default:
-	    Tcl_AppendResult(interp, "(more than one refCount added!)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(more than one refCount added!)", (char *)NULL);
 	    Tcl_Panic("extremely unsafe behaviour by Tcl_ConcatObj()");
 	}
 	tmpPtr = Tcl_DuplicateObj(list1Ptr);
@@ -8192,26 +8192,26 @@ TestconcatobjCmd(
     if (concatPtr->refCount != 0) {
 	result = TCL_ERROR;
 	Tcl_AppendResult(interp,
-		"\n\t* (b) concatObj does not have refCount 0", (void *)NULL);
+		"\n\t* (b) concatObj does not have refCount 0", (char *)NULL);
     }
     if (concatPtr == tmpPtr) {
 	result = TCL_ERROR;
 	Tcl_AppendResult(interp, "\n\t* (b) concatObj is not a new obj ",
-		(void *)NULL);
+		(char *)NULL);
 	switch (tmpPtr->refCount) {
 	case 0:
-	    Tcl_AppendResult(interp, "(refCount removed?)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(refCount removed?)", (char *)NULL);
 	    Tcl_Panic("extremely unsafe behaviour by Tcl_ConcatObj()");
 	    break;
 	case 1:
-	    Tcl_AppendResult(interp, "(no new refCount)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(no new refCount)", (char *)NULL);
 	    break;
 	case 2:
-	    Tcl_AppendResult(interp, "(refCount added)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(refCount added)", (char *)NULL);
 	    Tcl_DecrRefCount(tmpPtr);
 	    break;
 	default:
-	    Tcl_AppendResult(interp, "(more than one refCount added!)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(more than one refCount added!)", (char *)NULL);
 	    Tcl_Panic("extremely unsafe behaviour by Tcl_ConcatObj()");
 	}
 	tmpPtr = Tcl_DuplicateObj(list1Ptr);
@@ -8226,21 +8226,21 @@ TestconcatobjCmd(
     if (concatPtr->refCount != 0) {
 	result = TCL_ERROR;
 	Tcl_AppendResult(interp,
-		"\n\t* (c) concatObj does not have refCount 0", (void *)NULL);
+		"\n\t* (c) concatObj does not have refCount 0", (char *)NULL);
     }
     if (concatPtr == tmpPtr) {
 	result = TCL_ERROR;
 	Tcl_AppendResult(interp, "\n\t* (c) concatObj is not a new obj ",
-		(void *)NULL);
+		(char *)NULL);
 	switch (tmpPtr->refCount) {
 	case 0:
-	    Tcl_AppendResult(interp, "(no new refCount)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(no new refCount)", (char *)NULL);
 	    break;
 	case 1:
-	    Tcl_AppendResult(interp, "(refCount added)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(refCount added)", (char *)NULL);
 	    break;
 	default:
-	    Tcl_AppendResult(interp, "(more than one refCount added!)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(more than one refCount added!)", (char *)NULL);
 	    Tcl_Panic("extremely unsafe behaviour by Tcl_ConcatObj()");
 	}
 	tmpPtr = Tcl_DuplicateObj(list1Ptr);
@@ -8253,26 +8253,26 @@ TestconcatobjCmd(
     if (concatPtr->refCount != 0) {
 	result = TCL_ERROR;
 	Tcl_AppendResult(interp,
-		"\n\t* (d) concatObj does not have refCount 0", (void *)NULL);
+		"\n\t* (d) concatObj does not have refCount 0", (char *)NULL);
     }
     if (concatPtr == tmpPtr) {
 	result = TCL_ERROR;
 	Tcl_AppendResult(interp, "\n\t* (d) concatObj is not a new obj ",
-		(void *)NULL);
+		(char *)NULL);
 	switch (tmpPtr->refCount) {
 	case 0:
-	    Tcl_AppendResult(interp, "(refCount removed?)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(refCount removed?)", (char *)NULL);
 	    Tcl_Panic("extremely unsafe behaviour by Tcl_ConcatObj()");
 	    break;
 	case 1:
-	    Tcl_AppendResult(interp, "(no new refCount)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(no new refCount)", (char *)NULL);
 	    break;
 	case 2:
-	    Tcl_AppendResult(interp, "(refCount added)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(refCount added)", (char *)NULL);
 	    Tcl_DecrRefCount(tmpPtr);
 	    break;
 	default:
-	    Tcl_AppendResult(interp, "(more than one refCount added!)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(more than one refCount added!)", (char *)NULL);
 	    Tcl_Panic("extremely unsafe behaviour by Tcl_ConcatObj()");
 	}
 	tmpPtr = Tcl_DuplicateObj(list1Ptr);
@@ -8291,20 +8291,20 @@ TestconcatobjCmd(
     if (concatPtr->refCount != 0) {
 	result = TCL_ERROR;
 	Tcl_AppendResult(interp,
-		"\n\t* (e) concatObj does not have refCount 0", (void *)NULL);
+		"\n\t* (e) concatObj does not have refCount 0", (char *)NULL);
     }
     if (concatPtr == tmpPtr) {
 	result = TCL_ERROR;
 	Tcl_AppendResult(interp, "\n\t* (e) concatObj is not a new obj ",
-		(void *)NULL);
+		(char *)NULL);
 
 	(void) Tcl_ListObjLength(NULL, concatPtr, &len);
 	switch (tmpPtr->refCount) {
 	case 3:
-	    Tcl_AppendResult(interp, "(failed to concat)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(failed to concat)", (char *)NULL);
 	    break;
 	default:
-	    Tcl_AppendResult(interp, "(corrupted input!)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(corrupted input!)", (char *)NULL);
 	}
 	if (Tcl_IsShared(tmpPtr)) {
 	    Tcl_DecrRefCount(tmpPtr);
@@ -8321,20 +8321,20 @@ TestconcatobjCmd(
     if (concatPtr->refCount != 0) {
 	result = TCL_ERROR;
 	Tcl_AppendResult(interp,
-		"\n\t* (f) concatObj does not have refCount 0", (void *)NULL);
+		"\n\t* (f) concatObj does not have refCount 0", (char *)NULL);
     }
     if (concatPtr == tmpPtr) {
 	result = TCL_ERROR;
 	Tcl_AppendResult(interp, "\n\t* (f) concatObj is not a new obj ",
-		(void *)NULL);
+		(char *)NULL);
 
 	(void) Tcl_ListObjLength(NULL, concatPtr, &len);
 	switch (tmpPtr->refCount) {
 	case 3:
-	    Tcl_AppendResult(interp, "(failed to concat)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(failed to concat)", (char *)NULL);
 	    break;
 	default:
-	    Tcl_AppendResult(interp, "(corrupted input!)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(corrupted input!)", (char *)NULL);
 	}
 	if (Tcl_IsShared(tmpPtr)) {
 	    Tcl_DecrRefCount(tmpPtr);
@@ -8352,20 +8352,20 @@ TestconcatobjCmd(
     if (concatPtr->refCount != 0) {
 	result = TCL_ERROR;
 	Tcl_AppendResult(interp,
-		"\n\t* (g) concatObj does not have refCount 0", (void *)NULL);
+		"\n\t* (g) concatObj does not have refCount 0", (char *)NULL);
     }
     if (concatPtr == tmpPtr) {
 	result = TCL_ERROR;
 	Tcl_AppendResult(interp, "\n\t* (g) concatObj is not a new obj ",
-		(void *)NULL);
+		(char *)NULL);
 
 	(void) Tcl_ListObjLength(NULL, concatPtr, &len);
 	switch (tmpPtr->refCount) {
 	case 3:
-	    Tcl_AppendResult(interp, "(failed to concat)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(failed to concat)", (char *)NULL);
 	    break;
 	default:
-	    Tcl_AppendResult(interp, "(corrupted input!)", (void *)NULL);
+	    Tcl_AppendResult(interp, "(corrupted input!)", (char *)NULL);
 	}
 	Tcl_DecrRefCount(tmpPtr);
 	if (Tcl_IsShared(tmpPtr)) {
@@ -8673,7 +8673,7 @@ TestInterpResolverCmd(
     if (objc == 3) {
 	interp = Tcl_GetChild(interp, Tcl_GetString(objv[2]));
 	if (interp == NULL) {
-	    Tcl_AppendResult(interp, "provided interpreter not found", (void *)NULL);
+	    Tcl_AppendResult(interp, "provided interpreter not found", (char *)NULL);
 	    return TCL_ERROR;
 	}
     }
@@ -8689,7 +8689,7 @@ TestInterpResolverCmd(
     case 0: /*down*/
 	if (!Tcl_RemoveInterpResolvers(interp, RESOLVER_KEY)) {
 	    Tcl_AppendResult(interp, "could not remove the resolver scheme",
-		    (void *)NULL);
+		    (char *)NULL);
 	    return TCL_ERROR;
 	}
     }
diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl
index 89e4ccc..87de58c 100644
--- a/tools/genStubs.tcl
+++ b/tools/genStubs.tcl
@@ -822,9 +822,9 @@ proc genStubs::forAllStubs {name slotProc onAll textVar
 			# TkIntStubs entry 113 for aqua is in fact at position
 			# 114 in the table, entry 114 at position 116 etc).
 			eval {append temp} $skipString
-			set temp "[string range $temp 0 end-1] /*\
+			set temp "# if TCL_MAJOR_VERSION < 9\n[string range $temp 0 end-1] /*\
 				Dummy entry for stubs table backwards\
-				compatibility */\n"
+				compatibility */\n# endif /* TCL_MAJOR_VERSION < 9 */\n"
 		    }
 		    if {$slot($plat)} {
 			append temp [$slotProc $name $stubs($name,$plat,$i) $i]
diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c
index 165c5e3..3a1d3d4 100644
--- a/unix/dltest/pkgb.c
+++ b/unix/dltest/pkgb.c
@@ -56,7 +56,7 @@ Pkgb_SubObjCmd(
 	    || (Tcl_GetIntFromObj(interp, objv[2], &second) != TCL_OK)) {
 	char buf[TCL_INTEGER_SPACE];
 	snprintf(buf, sizeof(buf), "%d", Tcl_GetErrorLine(interp));
-	Tcl_AppendResult(interp, " in line: ", buf, (void *)NULL);
+	Tcl_AppendResult(interp, " in line: ", buf, (char *)NULL);
 	return TCL_ERROR;
     }
     Tcl_SetObjResult(interp, Tcl_NewIntObj(first - second));
diff --git a/unix/dltest/pkgooa.c b/unix/dltest/pkgooa.c
index 60e3864..7a84481 100644
--- a/unix/dltest/pkgooa.c
+++ b/unix/dltest/pkgooa.c
@@ -108,18 +108,18 @@ Pkgooa_Init(
     }
     if (tclStubsPtr == NULL) {
 	Tcl_AppendResult(interp, "Tcl stubs are not initialized, "
-		"did you compile using -DUSE_TCL_STUBS? ", (void *)NULL);
+		"did you compile using -DUSE_TCL_STUBS? ", (char *)NULL);
 	return TCL_ERROR;
     }
     if (Tcl_OOInitStubs(interp) == NULL) {
 	return TCL_ERROR;
     }
     if (tclOOStubsPtr == NULL) {
-	Tcl_AppendResult(interp, "TclOO stubs are not initialized", (void *)NULL);
+	Tcl_AppendResult(interp, "TclOO stubs are not initialized", (char *)NULL);
 	return TCL_ERROR;
     }
     if (tclOOIntStubsPtr == NULL) {
-	Tcl_AppendResult(interp, "TclOO internal stubs are not initialized", (void *)NULL);
+	Tcl_AppendResult(interp, "TclOO internal stubs are not initialized", (char *)NULL);
 	return TCL_ERROR;
     }
 
diff --git a/unix/tclLoadDl.c b/unix/tclLoadDl.c
index 13b183b..f0eab5c 100644
--- a/unix/tclLoadDl.c
+++ b/unix/tclLoadDl.c
@@ -224,7 +224,7 @@ FindSymbol(
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "cannot find symbol \"%s\": %s", symbol, errorStr));
 	    Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "LOAD_SYMBOL", symbol,
-		    (void *)NULL);
+		    (char *)NULL);
 	}
     }
     return proc;
diff --git a/unix/tclLoadDyld.c b/unix/tclLoadDyld.c
index 375771c..43cb806 100644
--- a/unix/tclLoadDyld.c
+++ b/unix/tclLoadDyld.c
@@ -414,7 +414,7 @@ FindSymbol(
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"cannot find symbol \"%s\": %s", symbol, errMsg));
 	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "LOAD_SYMBOL", symbol,
-		(void *)NULL);
+		(char *)NULL);
     }
     return (void *)proc;
 }
diff --git a/unix/tclLoadNext.c b/unix/tclLoadNext.c
index b52fa2a..fe511f9 100644
--- a/unix/tclLoadNext.c
+++ b/unix/tclLoadNext.c
@@ -146,7 +146,7 @@ FindSymbol(
     if (proc == NULL && interp != NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"cannot find symbol \"%s\"", symbol));
-	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "LOAD_SYMBOL", symbol, (void *)NULL);
+	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "LOAD_SYMBOL", symbol, (char *)NULL);
     }
     return proc;
 }
diff --git a/unix/tclLoadOSF.c b/unix/tclLoadOSF.c
index 81468b8..1c423bd 100644
--- a/unix/tclLoadOSF.c
+++ b/unix/tclLoadOSF.c
@@ -164,7 +164,7 @@ FindSymbol(
     if (retval == NULL && interp != NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"cannot find symbol \"%s\"", symbol));
-	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "LOAD_SYMBOL", symbol, (void *)NULL);
+	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "LOAD_SYMBOL", symbol, (char *)NULL);
     }
     return retval;
 }
diff --git a/unix/tclXtTest.c b/unix/tclXtTest.c
index c6bcc18..ad7cb77 100644
--- a/unix/tclXtTest.c
+++ b/unix/tclXtTest.c
@@ -117,7 +117,7 @@ TesteventloopCmd(
 	framePtr = oldFramePtr;
     } else {
 	Tcl_AppendResult(interp, "bad option \"", Tcl_GetString(objv[1]),
-		"\": must be done or wait", (void *)NULL);
+		"\": must be done or wait", (char *)NULL);
 	return TCL_ERROR;
     }
     return TCL_OK;
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index d883bac..f36407d 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -578,7 +578,7 @@ ExecuteRemoteObject(
 	Tcl_SetObjResult(riPtr->interp, Tcl_NewStringObj("permission denied: "
 		"a handler procedure must be defined for use in a safe "
 		"interp", -1));
-	Tcl_SetErrorCode(riPtr->interp, "TCL", "DDE", "SECURITY_CHECK", (void *)NULL);
+	Tcl_SetErrorCode(riPtr->interp, "TCL", "DDE", "SECURITY_CHECK", (char *)NULL);
 	result = TCL_ERROR;
     }
 
@@ -1050,7 +1050,7 @@ MakeDdeConnection(
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "no registered server named \"%s\"", Tcl_DStringValue(&dString)));
 	    Tcl_DStringFree(&dString);
-	    Tcl_SetErrorCode(interp, "TCL", "DDE", "NO_SERVER", (void *)NULL);
+	    Tcl_SetErrorCode(interp, "TCL", "DDE", "NO_SERVER", (char *)NULL);
 	}
 	return TCL_ERROR;
     }
@@ -1281,7 +1281,7 @@ SetDdeError(
     }
 
     Tcl_SetObjResult(interp, Tcl_NewStringObj(errorMessage, -1));
-    Tcl_SetErrorCode(interp, "TCL", "DDE", errorCode, (void *)NULL);
+    Tcl_SetErrorCode(interp, "TCL", "DDE", errorCode, (char *)NULL);
 }
 
 /*
@@ -1568,7 +1568,7 @@ DdeObjCmd(
 	    Tcl_SetObjResult(interp,
 		    Tcl_NewStringObj("cannot execute null data", -1));
 	    Tcl_DStringFree(&dsBuf);
-	    Tcl_SetErrorCode(interp, "TCL", "DDE", "NULL", (void *)NULL);
+	    Tcl_SetErrorCode(interp, "TCL", "DDE", "NULL", (char *)NULL);
 	    result = TCL_ERROR;
 	    break;
 	}
@@ -1618,7 +1618,7 @@ DdeObjCmd(
 	if (length == 0) {
 	    Tcl_SetObjResult(interp,
 		    Tcl_NewStringObj("cannot request value of null data", -1));
-	    Tcl_SetErrorCode(interp, "TCL", "DDE", "NULL", (void *)NULL);
+	    Tcl_SetErrorCode(interp, "TCL", "DDE", "NULL", (char *)NULL);
 	    result = TCL_ERROR;
 	    goto cleanup;
 	}
@@ -1684,7 +1684,7 @@ DdeObjCmd(
 	if (length == 0) {
 	    Tcl_SetObjResult(interp,
 		    Tcl_NewStringObj("cannot have a null item", -1));
-	    Tcl_SetErrorCode(interp, "TCL", "DDE", "NULL", (void *)NULL);
+	    Tcl_SetErrorCode(interp, "TCL", "DDE", "NULL", (char *)NULL);
 	    result = TCL_ERROR;
 	    goto cleanup;
 	}
@@ -1738,7 +1738,7 @@ DdeObjCmd(
 	if (serviceName == NULL) {
 	    Tcl_SetObjResult(interp,
 		    Tcl_NewStringObj("invalid service name \"\"", -1));
-	    Tcl_SetErrorCode(interp, "TCL", "DDE", "NO_SERVER", (void *)NULL);
+	    Tcl_SetErrorCode(interp, "TCL", "DDE", "NO_SERVER", (char *)NULL);
 	    result = TCL_ERROR;
 	    goto cleanup;
 	}
@@ -1787,7 +1787,7 @@ DdeObjCmd(
 			"permission denied: a handler procedure must be"
 			" defined for use in a safe interp", -1));
 		Tcl_SetErrorCode(interp, "TCL", "DDE", "SECURITY_CHECK",
-			(void *)NULL);
+			(char *)NULL);
 		result = TCL_ERROR;
 	    }
 
@@ -1852,7 +1852,7 @@ DdeObjCmd(
 	    invalidServerResponse:
 		Tcl_SetObjResult(interp,
 			Tcl_NewStringObj("invalid data returned from server", -1));
-		Tcl_SetErrorCode(interp, "TCL", "DDE", "BAD_RESPONSE", (void *)NULL);
+		Tcl_SetErrorCode(interp, "TCL", "DDE", "BAD_RESPONSE", (char *)NULL);
 		result = TCL_ERROR;
 		goto cleanup;
 	    }
diff --git a/win/tclWinLoad.c b/win/tclWinLoad.c
index a03132f..8d2e5b3 100644
--- a/win/tclWinLoad.c
+++ b/win/tclWinLoad.c
@@ -133,32 +133,32 @@ TclpDlopen(
 	if (interp) {
 	    switch (lastError) {
 	    case ERROR_MOD_NOT_FOUND:
-		Tcl_SetErrorCode(interp, "WIN_LOAD", "MOD_NOT_FOUND", (void *)NULL);
+		Tcl_SetErrorCode(interp, "WIN_LOAD", "MOD_NOT_FOUND", (char *)NULL);
 		goto notFoundMsg;
 	    case ERROR_DLL_NOT_FOUND:
-		Tcl_SetErrorCode(interp, "WIN_LOAD", "DLL_NOT_FOUND", (void *)NULL);
+		Tcl_SetErrorCode(interp, "WIN_LOAD", "DLL_NOT_FOUND", (char *)NULL);
 	    notFoundMsg:
 		Tcl_AppendToObj(errMsg, "this library or a dependent library"
 			" could not be found in library path", TCL_INDEX_NONE);
 		break;
 	    case ERROR_PROC_NOT_FOUND:
-		Tcl_SetErrorCode(interp, "WIN_LOAD", "PROC_NOT_FOUND", (void *)NULL);
+		Tcl_SetErrorCode(interp, "WIN_LOAD", "PROC_NOT_FOUND", (char *)NULL);
 		Tcl_AppendToObj(errMsg, "A function specified in the import"
 			" table could not be resolved by the system. Windows"
 			" is not telling which one, I'm sorry.", TCL_INDEX_NONE);
 		break;
 	    case ERROR_INVALID_DLL:
-		Tcl_SetErrorCode(interp, "WIN_LOAD", "INVALID_DLL", (void *)NULL);
+		Tcl_SetErrorCode(interp, "WIN_LOAD", "INVALID_DLL", (char *)NULL);
 		Tcl_AppendToObj(errMsg, "this library or a dependent library"
 			" is damaged", TCL_INDEX_NONE);
 		break;
 	    case ERROR_DLL_INIT_FAILED:
-		Tcl_SetErrorCode(interp, "WIN_LOAD", "DLL_INIT_FAILED", (void *)NULL);
+		Tcl_SetErrorCode(interp, "WIN_LOAD", "DLL_INIT_FAILED", (char *)NULL);
 		Tcl_AppendToObj(errMsg, "the library initialization"
 			" routine failed", TCL_INDEX_NONE);
 		break;
             case ERROR_BAD_EXE_FORMAT:
-		Tcl_SetErrorCode(interp, "WIN_LOAD", "BAD_EXE_FORMAT", (void *)NULL);
+		Tcl_SetErrorCode(interp, "WIN_LOAD", "BAD_EXE_FORMAT", (char *)NULL);
 		Tcl_AppendToObj(errMsg, "Bad exe format. Possibly a 32/64-bit mismatch.", TCL_INDEX_NONE);
                 break;
             default:
@@ -227,7 +227,7 @@ FindSymbol(
     if (proc == NULL && interp != NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"cannot find symbol \"%s\"", symbol));
-	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "LOAD_SYMBOL", symbol, (void *)NULL);
+	Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "LOAD_SYMBOL", symbol, (char *)NULL);
     }
     return proc;
 }
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index a0b4e90..68e22cb 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -466,7 +466,7 @@ DeleteKey(
     if (*keyName == '\0') {
 	Tcl_SetObjResult(interp,
 		Tcl_NewStringObj("bad key: cannot delete root keys", -1));
-	Tcl_SetErrorCode(interp, "WIN_REG", "DEL_ROOT_KEY", (void *)NULL);
+	Tcl_SetErrorCode(interp, "WIN_REG", "DEL_ROOT_KEY", (char *)NULL);
 	Tcl_Free(buffer);
 	return TCL_ERROR;
     }
@@ -1146,7 +1146,7 @@ ParseKeyName(
     if (!rootName) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"bad key \"%s\": must start with a valid root", name));
-	Tcl_SetErrorCode(interp, "WIN_REG", "NO_ROOT_KEY", (void *)NULL);
+	Tcl_SetErrorCode(interp, "WIN_REG", "NO_ROOT_KEY", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -1538,7 +1538,7 @@ AppendSystemError(
     }
 
     snprintf(id, sizeof(id), "%ld", error);
-    Tcl_SetErrorCode(interp, "WINDOWS", id, msg, (void *)NULL);
+    Tcl_SetErrorCode(interp, "WINDOWS", id, msg, (char *)NULL);
     Tcl_AppendToObj(resultPtr, msg, length);
     Tcl_SetObjResult(interp, resultPtr);