summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-11-13 08:16:51 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-11-13 08:16:51 (GMT)
commitde04d595faa9eff7914a831e767b11a2d5116b44 (patch)
tree27886295c383cd46e79b21ba8f97808f3cc1c6ce
parent589c6b9de8a4f5edbe0a2d25cedb2ae0b93c50d3 (diff)
downloadtcl-de04d595faa9eff7914a831e767b11a2d5116b44.zip
tcl-de04d595faa9eff7914a831e767b11a2d5116b44.tar.gz
tcl-de04d595faa9eff7914a831e767b11a2d5116b44.tar.bz2
Fix compiler warning when compiling with -DTCL_UTF_MAX=4 or 6
-rw-r--r--win/tclWinDde.c4
-rw-r--r--win/tclWinReg.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index cbbcdae..267ee6e 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -119,8 +119,8 @@ static int DdeObjCmd(void *clientData,
#if (TCL_MAJOR_VERSION < 9) && (TCL_MINOR_VERSION < 7)
# if TCL_UTF_MAX > 3
-# define Tcl_WCharToUtfDString(a,b,c) Tcl_WinTCharToUtf(a,(b)*sizeof(WCHAR),c)
-# define Tcl_UtfToWCharDString(a,b,c) Tcl_WinUtfToTChar(a,b,c)
+# define Tcl_WCharToUtfDString(a,b,c) Tcl_WinTCharToUtf((TCHAR *)(a),(b)*sizeof(WCHAR),c)
+# define Tcl_UtfToWCharDString(a,b,c) (WCHAR *)Tcl_WinUtfToTChar(a,b,c)
# else
# define Tcl_WCharToUtfDString Tcl_UniCharToUtfDString
# define Tcl_UtfToWCharDString Tcl_UtfToUniCharDString
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index b66282a..2c1b8a5 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -126,8 +126,8 @@ static int SetValue(Tcl_Interp *interp, Tcl_Obj *keyNameObj,
#if (TCL_MAJOR_VERSION < 9) && (TCL_MINOR_VERSION < 7)
# if TCL_UTF_MAX > 3
-# define Tcl_WCharToUtfDString(a,b,c) Tcl_WinTCharToUtf(a,(b)*sizeof(WCHAR),c)
-# define Tcl_UtfToWCharDString(a,b,c) Tcl_WinUtfToTChar(a,b,c)
+# define Tcl_WCharToUtfDString(a,b,c) Tcl_WinTCharToUtf((TCHAR *)(a),(b)*sizeof(WCHAR),c)
+# define Tcl_UtfToWCharDString(a,b,c) (WCHAR *)Tcl_WinUtfToTChar(a,b,c)
# else
# define Tcl_WCharToUtfDString Tcl_UniCharToUtfDString
# define Tcl_UtfToWCharDString Tcl_UtfToUniCharDString