2 files changed, 7 insertions, 7 deletions
diff --git a/win/rules.vc b/win/rules.vc
index 1206677..b125047 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -686,7 +686,7 @@ LINKERFLAGS     = $(LINKERFLAGS) -ltcg
 #           configuration (ignored for Tcl itself)
 # _USE_64BIT_TIME_T - forces a build using 64-bit time_t for 32-bit build
 #           (CRT library should support this)
-# TCL_UTF_MAX=6 - forces a build using 32-bit Tcl_UniChar in stead of 16-bit.
+# TCL_UTF_MAX=4 - forces a build using 32-bit Tcl_UniChar in stead of 16-bit.
 # Further, LINKERFLAGS are modified based on above.
 
 # Default values for all the above
@@ -753,7 +753,7 @@ _USE_64BIT_TIME_T = 1
 
 !if [nmakehlp -f $(OPTS) "utfmax"]
 !message *** Force 32-bit Tcl_UniChar
-TCL_UTF_MAX = 6
+TCL_UTF_MAX = 4
 !endif
 
 # Yes, it's weird that the "symbols" option controls DEBUG and
@@ -1203,8 +1203,8 @@ tklibs = "$(TKSTUBLIB)" "$(TKIMPLIB)"
 !endif # $(DOING_TK) || $(NEED_TK)
 
 # Various output paths
-PRJIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX:t=).lib
-PRJLIBNAME	= $(PROJECT)$(VERSION)$(SUFX:t=).$(EXT)
+PRJIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
+PRJLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)
 PRJLIB		= $(OUT_DIR)\$(PRJLIBNAME)
 
 PRJSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib
@@ -1344,7 +1344,7 @@ OPTDEFINES	= $(OPTDEFINES) /DNO_STRTOI64
 OPTDEFINES	= $(OPTDEFINES) /D_USE_64BIT_TIME_T
 !endif
 !if "$(TCL_UTF_MAX)" == "6"
-OPTDEFINES	= $(OPTDEFINES) /DTCL_UTF_MAX=6
+OPTDEFINES	= $(OPTDEFINES) /DTCL_UTF_MAX=4
 !endif
 
 # _ATL_XP_TARGETING - Newer SDK's need this to build for XP
@@ -1517,7 +1517,7 @@ RESCMD  = $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \
 	    /DCOMMAVERSION=$(RCCOMMAVERSION) \
 	    /DDOTVERSION=\"$(DOTVERSION)\" \
 	    /DVERSION=\"$(VERSION)\" \
-	    /DSUFX=\"$(SUFX:t=)\" \
+	    /DSUFX=\"$(SUFX)\" \
 	    /DPROJECT=\"$(PROJECT)\" \
 	    /DPRJLIBNAME=\"$(PRJLIBNAME)\"
 
diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c
index 65af10f..e945055 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[TCL_UTF_MAX];
+	char buf[4];
 	valid = 1;
 
 	if (!GetCommState(infoPtr->handle, &dcb)) {