diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-13 16:11:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-13 16:11:37 (GMT) |
| commit | e9559b5cc04cd58f930641ade823105aebf97d67 (patch) | |
| tree | 30276063fe51f4a10278b541146de7ffd88198d5 /win | |
| parent | 6ce8973116434643e4d28c3a1aa049bd4bde2e38 (diff) | |
| parent | 8126172c86ecff9bb2ec136731e70ea805aa552b (diff) | |
| download | tcl-e9559b5cc04cd58f930641ade823105aebf97d67.zip tcl-e9559b5cc04cd58f930641ade823105aebf97d67.tar.gz tcl-e9559b5cc04cd58f930641ade823105aebf97d67.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 2 | ||||
| -rw-r--r-- | win/tclWinDde.c | 4 | ||||
| -rw-r--r-- | win/tclWinPort.h | 3 | ||||
| -rw-r--r-- | win/tclWinReg.c | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 216d5d9..adf3a11 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -904,8 +904,6 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata @$(CPY) "$(GENERICDIR)\tclPlatDecls.h" "$(INCLUDE_INSTALL_DIR)\"
@$(CPY) "$(GENERICDIR)\tclTomMath.h" "$(INCLUDE_INSTALL_DIR)\"
@$(CPY) "$(GENERICDIR)\tclTomMathDecls.h" "$(INCLUDE_INSTALL_DIR)\"
- @$(CPY) "$(TOMMATHDIR)\tommath_class.h" "$(INCLUDE_INSTALL_DIR)\"
- @$(CPY) "$(TOMMATHDIR)\tommath_superclass.h" "$(INCLUDE_INSTALL_DIR)\"
@echo Installing library files to $(SCRIPT_INSTALL_DIR)
@$(CPY) "$(ROOT)\library\history.tcl" "$(SCRIPT_INSTALL_DIR)\"
@$(CPY) "$(ROOT)\library\init.tcl" "$(SCRIPT_INSTALL_DIR)\"
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/tclWinPort.h b/win/tclWinPort.h index 6b27d16..774a0a4 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -83,6 +83,9 @@ typedef DWORD_PTR * PDWORD_PTR; #include <malloc.h> #include <process.h> #include <signal.h> +#if HAVE_INTTYPES_H +# include <inttypes.h> +#endif #include <limits.h> #ifdef HAVE_STDINT_H # include <stdint.h> 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 |