Merge 8.6. Always compile with -DTCL_UTF_MAX=3 (possible now, because of TIP #622)

3 files changed, 11 insertions, 12 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index 77e461d..039e7d8 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -261,7 +261,7 @@ CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
 -I"${GENERIC_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \
 -I"${XLIB_DIR_NATIVE}" -I"${BITMAP_DIR_NATIVE}" \
 -I"${TCL_GENERIC_NATIVE}" -I"${TCL_PLATFORM_NATIVE}" \
-${AC_FLAGS} $(NO_DEPRECATED_FLAGS) -DUSE_TCL_STUBS
+${AC_FLAGS} $(NO_DEPRECATED_FLAGS) -DTCL_UTF_MAX=3 -DUSE_TCL_STUBS
 
 CC_OBJNAME = @CC_OBJNAME@
 CC_EXENAME = @CC_EXENAME@
diff --git a/win/makefile.vc b/win/makefile.vc
index 5d41d62..ae32548 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -346,7 +346,7 @@ PRJ_INCLUDES	= -I"$(BITMAPDIR)" -I"$(XLIBDIR)"
 

 CONFIG_DEFS     =/DHAVE_SYS_TYPES_H=1 /DHAVE_SYS_STAT_H=1 \

 		 /DHAVE_STRING_H=1 /DHAVE_MEMORY_H=1 \

-		 /DHAVE_STRINGS_H=1 \

+		 /DHAVE_STRINGS_H=1 /DTCL_UTF_MAX=3 \

 !if $(HAVE_UXTHEME_H)

 		 /DHAVE_UXTHEME_H=1 \

 !endif

diff --git a/win/rules.vc b/win/rules.vc
index 372d70a..3107756 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -816,8 +816,7 @@ DOTSEPARATED=$(DOTSEPARATED:b=.)
 #           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, not needed for Tcl 9.x)

-# TCL_UTF_MAX=4 - forces a build allowing 4-byte UTF-8 sequences internally.

-#           (Not needed for Tcl 9.x)

+# TCL_UTF_MAX=3 - forces a build using UTF-16 internally (not recommended).

 # Further, LINKERFLAGS are modified based on above.

 

 # Default values for all the above

@@ -884,9 +883,9 @@ USE_THREAD_ALLOC= 0
 _USE_64BIT_TIME_T = 1

 !endif

 

-!if [nmakehlp -f $(OPTS) "utfmax"]

-!message *** Force allowing 4-byte UTF-8 sequences internally

-TCL_UTF_MAX = 4

+!if [nmakehlp -f $(OPTS) "utf16"]

+!message *** Force UTF-16 internally

+TCL_UTF_MAX = 3

 !endif

 !endif

 

@@ -1423,13 +1422,13 @@ OPTDEFINES	= $(OPTDEFINES) /DNO_STRTOI64=1
 !if "$(_USE_64BIT_TIME_T)" == "1"

 OPTDEFINES	= $(OPTDEFINES) /D_USE_64BIT_TIME_T=1

 !endif

-!if "$(TCL_UTF_MAX)" == "4"

-OPTDEFINES	= $(OPTDEFINES) /DTCL_UTF_MAX=4

-!endif

 

 # _ATL_XP_TARGETING - Newer SDK's need this to build for XP

 COMPILERFLAGS  = /D_ATL_XP_TARGETING

 !endif

+!if "$(TCL_UTF_MAX)" == "3"

+OPTDEFINES	= $(OPTDEFINES) /DTCL_UTF_MAX=3

+!endif

 

 # Like the TEA system only set this non empty for non-Tk extensions

 # Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME

@@ -1471,8 +1470,8 @@ cdebug = $(cdebug) -Zi
 

 !endif # $(DEBUG)

 

-# cwarn includes default warning levels.

-cwarn = $(WARNINGS)

+# cwarn includes default warning levels, also C4146 is useless.

+cwarn = $(WARNINGS) -wd4146

 

 !if "$(MACHINE)" == "AMD64" || "$(MACHINE)" == "ARM64"

 # Disable pointer<->int warnings related to cast between different sizes