diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-12 20:47:01 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-12 20:47:01 (GMT) |
| commit | 92c04315ff11b03e5364e616f3d5efc0a5144d24 (patch) | |
| tree | 94c708d8e51b061fe67844acceaa32da907d86de /win | |
| parent | 8ddf96d852b04a3a1e7e109e16f8c3a21b31d2a2 (diff) | |
| download | tcl-92c04315ff11b03e5364e616f3d5efc0a5144d24.zip tcl-92c04315ff11b03e5364e616f3d5efc0a5144d24.tar.gz tcl-92c04315ff11b03e5364e616f3d5efc0a5144d24.tar.bz2 | |
Forgot some changes from tip-548
Diffstat (limited to 'win')
| -rw-r--r-- | win/tclWin32Dll.c | 2 | ||||
| -rw-r--r-- | win/tclWinReg.c | 4 | ||||
| -rw-r--r-- | win/tclWinSerial.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c index 668412f..2b05bf3 100644 --- a/win/tclWin32Dll.c +++ b/win/tclWin32Dll.c @@ -463,7 +463,7 @@ TclWinDriveLetterForVolMountPoint( *--------------------------------------------------------------------------- */ -#if (TCL_UTF_MAX == 3) && !defined(TCL_NO_DEPRECATED) +#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9 #undef Tcl_WinUtfToTChar WCHAR * Tcl_WinUtfToTChar( diff --git a/win/tclWinReg.c b/win/tclWinReg.c index 02c8367..73208b9 100644 --- a/win/tclWinReg.c +++ b/win/tclWinReg.c @@ -228,7 +228,7 @@ Registry_Unload( * Delete the originally registered command. */ - cmd = Tcl_GetAssocData(interp, REGISTRY_ASSOC_KEY, NULL); + cmd = (Tcl_Command)Tcl_GetAssocData(interp, REGISTRY_ASSOC_KEY, NULL); if (cmd != NULL) { Tcl_DeleteCommandFromToken(interp, cmd); } @@ -257,7 +257,7 @@ static void DeleteCmd( ClientData clientData) { - Tcl_Interp *interp = clientData; + Tcl_Interp *interp = (Tcl_Interp *)clientData; Tcl_SetAssocData(interp, REGISTRY_ASSOC_KEY, NULL, NULL); } diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c index 4411e89..d6fa567 100644 --- a/win/tclWinSerial.c +++ b/win/tclWinSerial.c @@ -2152,7 +2152,7 @@ SerialGetOptionProc( Tcl_DStringStartSublist(dsPtr); } if (len==0 || (len>1 && strncmp(optionName, "-xchar", len) == 0)) { - char buf[4]; + char buf[TCL_UTF_MAX]; valid = 1; if (!GetCommState(infoPtr->handle, &dcb)) { |