diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-01-07 15:44:16 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-01-07 15:44:16 (GMT) |
| commit | 4afa38297142ce01a7e51a45b67a051b6244f8f7 (patch) | |
| tree | 361d48666eead19f276d5901336ee8e58279f405 /win | |
| parent | 14a974e2d0b4cef691c867645ea568f9c5add82d (diff) | |
| parent | 49a7184962b241204447d10cb9546f514237c344 (diff) | |
| download | tcl-4afa38297142ce01a7e51a45b67a051b6244f8f7.zip tcl-4afa38297142ce01a7e51a45b67a051b6244f8f7.tar.gz tcl-4afa38297142ce01a7e51a45b67a051b6244f8f7.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 6 | ||||
| -rw-r--r-- | win/tclWinChan.c | 6 | ||||
| -rw-r--r-- | win/tclWinConsole.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index ed8c248..2243214 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -249,9 +249,9 @@ MINIZIP_OBJS = \ ZIP_INSTALL_OBJS = @ZIP_INSTALL_OBJS@ -CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TCL_SHLIB_CFLAGS} \ --I"${GENERIC_DIR_NATIVE}" -I"${TOMMATH_DIR_NATIVE}" \ --DMP_PREC=4 -I"${ZLIB_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \ +CC_SWITCHES = -I"${GENERIC_DIR_NATIVE}" -I"${TOMMATH_DIR_NATIVE}" \ +-I"${ZLIB_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \ +${CFLAGS} ${CFLAGS_WARNING} ${TCL_SHLIB_CFLAGS} -DMP_PREC=4 \ ${AC_FLAGS} ${COMPILE_DEBUG_FLAGS} ${NO_DEPRECATED_FLAGS} CC_OBJNAME = @CC_OBJNAME@ diff --git a/win/tclWinChan.c b/win/tclWinChan.c index d300269..b08db5d 100644 --- a/win/tclWinChan.c +++ b/win/tclWinChan.c @@ -1068,7 +1068,7 @@ Tcl_MakeFileChannel( int mode) /* ORed combination of TCL_READABLE and * TCL_WRITABLE to indicate file mode. */ { -#if defined(HAVE_NO_SEH) && !defined(_WIN64) +#if defined(HAVE_NO_SEH) && !defined(_WIN64) && !defined(__clang__) TCLEXCEPTION_REGISTRATION registration; #endif char channelName[16 + TCL_INTEGER_SPACE]; @@ -1121,7 +1121,7 @@ Tcl_MakeFileChannel( if (result == 0) { /* - * Unable to make a duplicate. It's definately invalid at this + * Unable to make a duplicate. It's definitely invalid at this * point. */ @@ -1134,7 +1134,7 @@ Tcl_MakeFileChannel( */ result = 0; -#if defined(HAVE_NO_SEH) && !defined(_WIN64) +#if defined(HAVE_NO_SEH) && !defined(_WIN64) && !defined(__clang__) /* * Don't have SEH available, do things the hard way. Note that this * needs to be one block of asm, to avoid stack imbalance; also, it is diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c index 09262c0..7de425b 100644 --- a/win/tclWinConsole.c +++ b/win/tclWinConsole.c @@ -1380,7 +1380,7 @@ TclWinOpenConsoleChannel( Tcl_SetChannelOption(NULL, infoPtr->channel, "-translation", "auto"); Tcl_SetChannelOption(NULL, infoPtr->channel, "-eofchar", "\032 {}"); - Tcl_SetChannelOption(NULL, infoPtr->channel, "-encoding", "unicode"); + Tcl_SetChannelOption(NULL, infoPtr->channel, "-encoding", "utf-16"); return infoPtr->channel; } |