Merge 8.6

2 files changed, 10 insertions, 10 deletions

diff --git a/win/makefile.vc b/win/makefile.vc
index 0b36580..bbc66a8 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -55,7 +55,7 @@
 #       c:\tcl_src\win\>nmake -f makefile.vc release

 #       c:\tcl_src\win\>nmake -f makefile.vc test

 #       c:\tcl_src\win\>nmake -f makefile.vc install INSTALLDIR=c:\progra~1\tcl

-#       c:\tcl_src\win\>nmake -f makefile.vc release OPTS=pdbs 

+#       c:\tcl_src\win\>nmake -f makefile.vc release OPTS=pdbs

 #       c:\tcl_src\win\>nmake -f makefile.vc release OPTS=symbols

 #

 

diff --git a/win/rules.vc b/win/rules.vc
index 485a0f7..3059abf 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -394,7 +394,7 @@ MSG = ^
 

 

 # If INSTALLDIR set to Tcl installation root dir then reset to the

-# lib dir for installing extensions 

+# lib dir for installing extensions

 !if exist("$(_INSTALLDIR)\include\tcl.h")

 _INSTALLDIR=$(_INSTALLDIR)\lib

 !endif

@@ -561,7 +561,7 @@ NMAKEHLPC = $(_TCLDIR)\win\nmakehlp.c
 # The following macros are set:

 # OPTIMIZATIONS - the compiler flags to be used for optimized builds

 # DEBUGFLAGS - the compiler flags to be used for debug builds

-# LINKERFLAGS - Flags passed to the linker 

+# LINKERFLAGS - Flags passed to the linker

 #

 # Note that these are the compiler settings *available*, not those

 # that will be *used*. The latter depends on the OPTS macro settings

@@ -1343,7 +1343,7 @@ USE_WIDECHAR_API = 0
 !endif

 

 !if $(USE_WIDECHAR_API)

-COMPILERFLAGS = $(COMPILERFLAGS) /DUNICODE /D_UNICODE 

+COMPILERFLAGS = $(COMPILERFLAGS) /DUNICODE /D_UNICODE

 !endif

 

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

@@ -1353,7 +1353,7 @@ COMPILERFLAGS = $(COMPILERFLAGS) /DUNICODE /D_UNICODE
 PKGNAMEFLAGS = -DPACKAGE_NAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \

                -DPACKAGE_TCLNAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \

                -DPACKAGE_VERSION="\"$(DOTVERSION)\"" \

-               -DMODULE_SCOPE=extern 

+               -DMODULE_SCOPE=extern

 !endif

 

 # crt picks the C run time based on selected OPTS

@@ -1446,7 +1446,7 @@ pkgcflags_nostubs = $(appcflags_nostubs) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT)
 # compiled with another VC version. Check for this and fix accordingly.

 stubscflags = $(cflags) $(PKGNAMEFLAGS) $(PRJ_DEFINES) $(OPTDEFINES) -Zl -DSTATIC_BUILD $(INCLUDES)

 

-# Link flags 

+# Link flags

 

 !if $(DEBUG)

 ldebug	= -debug -debugtype:cv

@@ -1462,7 +1462,7 @@ ldebug	= $(ldebug) -debug -debugtype:cv
 ldebug= $(ldebug) -profile

 !endif

 

-### Declarations common to all linker versions 

+### Declarations common to all linker versions

 lflags	= -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug)

 

 !if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900

@@ -1527,7 +1527,7 @@ RESCMD  = $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \
 	    -DVERSION=\"$(VERSION)\" \

 	    -DSUFX=\"$(SUFX)\" \

             -DPROJECT=\"$(PROJECT)\" \

-            -DPRJLIBNAME=\"$(PRJLIBNAME)\" 

+            -DPRJLIBNAME=\"$(PRJLIBNAME)\"

 

 !ifndef DEFAULT_BUILD_TARGET

 DEFAULT_BUILD_TARGET = $(PROJECT)

@@ -1646,7 +1646,7 @@ default-shell: default-setup $(PROJECT)
 	@if exist $(LIBDIR) for %f in ("$(LIBDIR)\*.tcl") do @$(COPY) %f "$(OUT_DIR)"

 	$(DEBUGGER) $(TCLSH)

 

-# Generation of Windows version resource 

+# Generation of Windows version resource

 !ifdef RCFILE

 

 # Note: don't use $** in below rule because there may be other dependencies

@@ -1685,7 +1685,7 @@ BEGIN
             VALUE "OriginalFilename", PRJLIBNAME

             VALUE "FileVersion",      DOTVERSION

             VALUE "ProductName",      "Package " PROJECT " for Tcl"

-            VALUE "ProductVersion",   DOTVERSION 

+            VALUE "ProductVersion",   DOTVERSION

         END

     END

     BLOCK "VarFileInfo"