summaryrefslogtreecommitdiffstats
path: root/win/tclWinReg.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-02-26 07:51:52 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-02-26 07:51:52 (GMT)
commit9eeda3feb240ef5f29417a952c06a8c5b12dc3bd (patch)
treeea3d04c9f01ee325fd26106ac9201db61d44a670 /win/tclWinReg.c
parent0c37363fff7785844bfef6ce931dadefe8aa1d99 (diff)
downloadtcl-9eeda3feb240ef5f29417a952c06a8c5b12dc3bd.zip
tcl-9eeda3feb240ef5f29417a952c06a8c5b12dc3bd.tar.gz
tcl-9eeda3feb240ef5f29417a952c06a8c5b12dc3bd.tar.bz2
Make tclWinDde.c compilable with C++ compiler. dde -> 1.4.3
Make tclWinReg.c compilable with C++ compiler. registry -> 1.3.5
Diffstat (limited to 'win/tclWinReg.c')
-rw-r--r--win/tclWinReg.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index b66282a..7bbb10b 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
@@ -191,7 +191,7 @@ Registry_Init(
cmd = Tcl_CreateObjCommand(interp, "registry", RegistryObjCmd,
interp, DeleteCmd);
Tcl_SetAssocData(interp, REGISTRY_ASSOC_KEY, NULL, cmd);
- return Tcl_PkgProvideEx(interp, "registry", "1.3.4", NULL);
+ return Tcl_PkgProvideEx(interp, "registry", "1.3.5", NULL);
}
/*
@@ -444,7 +444,7 @@ DeleteKey(
*/
keyName = Tcl_GetString(keyNameObj);
- buffer = Tcl_Alloc(keyNameObj->length + 1);
+ buffer = (char *)Tcl_Alloc(keyNameObj->length + 1);
strcpy(buffer, keyName);
if (ParseKeyName(interp, buffer, &hostName, &rootKey,
@@ -977,7 +977,7 @@ OpenKey(
DWORD result;
keyName = Tcl_GetString(keyNameObj);
- buffer = Tcl_Alloc(keyNameObj->length + 1);
+ buffer = (char *)Tcl_Alloc(keyNameObj->length + 1);
strcpy(buffer, keyName);
result = ParseKeyName(interp, buffer, &hostName, &rootKey, &keyName);