Sync with core-8-branch

3 files changed, 39 insertions, 13 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index d6e725f..9a25029 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -890,8 +890,8 @@ install-libraries: libraries install-tzdata install-msgs
 	@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl "$(MODULE_INSTALL_DIR)/8.7/msgcat-1.7.1.tm";
 	@echo "Installing package tcltest 2.5.5 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.5.tm";
-	@echo "Installing package platform 1.0.18 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.18.tm";
+	@echo "Installing package platform 1.0.19 as a Tcl Module";
+	@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.19.tm";
 	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/platform/shell.tcl "$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm";
 	@echo "Installing encodings";
diff --git a/win/rules.vc b/win/rules.vc
index fdc68e0..89a72ce 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -24,7 +24,7 @@ _RULES_VC = 1
 # For modifications that are not backward-compatible, you *must* change

 # the major version.

 RULES_VERSION_MAJOR = 1

-RULES_VERSION_MINOR = 10

+RULES_VERSION_MINOR = 11

 

 # The PROJECT macro must be defined by parent makefile.

 !if "$(PROJECT)" == ""

@@ -877,6 +877,11 @@ TCL_THREADS = 0
 USE_THREAD_ALLOC= 0

 !endif

 

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

+!message *** Build for Tcl8

+TCL_BUILD_FOR = 8

+!endif

+

 !if $(TCL_MAJOR_VERSION) == 8

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

 !message *** Force 64-bit time_t

@@ -1146,7 +1151,11 @@ TCLLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)
 TCLLIB		= $(OUT_DIR)\$(TCLLIBNAME)

 TCLSCRIPTZIP    = $(OUT_DIR)\$(TCLSCRIPTZIPNAME)

 

+!if $(TCL_MAJOR_VERSION) == 8

 TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib

+!else

+TCLSTUBLIBNAME	= $(STUBPREFIX).lib

+!endif

 TCLSTUBLIB	= $(OUT_DIR)\$(TCLSTUBLIBNAME)

 TCL_INCLUDES    = -I"$(WIN_DIR)" -I"$(GENERICDIR)"

 

@@ -1162,7 +1171,11 @@ TCLSH		= $(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX:t=).exe
 TCLSH           = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX:t=).exe

 !endif

 

+!if $(TCL_MAJOR_VERSION) == 8

 TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib

+!else

+TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub.lib

+!endif

 TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX:t=).lib

 # When building extensions, may be linking against Tcl that does not add

 # "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.

@@ -1182,7 +1195,11 @@ TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX:t=).exe
 !if !exist($(TCLSH))

 TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX:t=).exe

 !endif

+!if $(TCL_MAJOR_VERSION) == 8

 TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib

+!else

+TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub.lib

+!endif

 TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX:t=).lib

 # When building extensions, may be linking against Tcl that does not add

 # "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.

@@ -1198,7 +1215,11 @@ TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"
 

 !endif # TCLINSTALL

 

+!if !$(STATIC_BUILD) && "$(TCL_BUILD_FOR)" == "8"

+tcllibs = "$(TCLSTUBLIB)"

+!else

 tcllibs = "$(TCLSTUBLIB)" "$(TCLIMPLIB)"

+!endif

 

 !endif # $(DOING_TCL)

 

@@ -1218,7 +1239,7 @@ WISHNAMEPREFIX = wish
 WISHNAME = $(WISHNAMEPREFIX)$(TK_VERSION)$(SUFX).exe

 TKLIBNAME8	= tk$(TK_VERSION)$(SUFX).$(EXT)

 TKLIBNAME9	= tcl9tk$(TK_VERSION)$(SUFX).$(EXT)

-!if $(TCL_MAJOR_VERSION) == 8

+!if $(TCL_MAJOR_VERSION) == 8 || "$(TCL_BUILD_FOR)" == "8"

 TKLIBNAME	= tk$(TK_VERSION)$(SUFX).$(EXT)

 TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX).lib

 !else

@@ -1275,14 +1296,18 @@ tklibs = "$(TKSTUBLIB)" "$(TKIMPLIB)"
 PRJIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib

 PRJLIBNAME8	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)

 PRJLIBNAME9	= tcl9$(PROJECT)$(VERSION)$(SUFX).$(EXT)

-!if $(TCL_MAJOR_VERSION) == 8

+!if $(TCL_MAJOR_VERSION) == 8 || "$(TCL_BUILD_FOR)" == "8"

 PRJLIBNAME	= $(PRJLIBNAME8)

 !else

 PRJLIBNAME	= $(PRJLIBNAME9)

 !endif

 PRJLIB		= $(OUT_DIR)\$(PRJLIBNAME)

 

+!if $(TCL_MAJOR_VERSION) == 8

 PRJSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib

+!else

+PRJSTUBLIBNAME	= $(STUBPREFIX).lib

+!endif

 PRJSTUBLIB	= $(OUT_DIR)\$(PRJSTUBLIBNAME)

 

 # If extension parent makefile has not defined a resource definition file,

@@ -1429,6 +1454,9 @@ COMPILERFLAGS  = /D_ATL_XP_TARGETING
 !if "$(TCL_UTF_MAX)" == "3"

 OPTDEFINES	= $(OPTDEFINES) /DTCL_UTF_MAX=3

 !endif

+!if "$(TCL_BUILD_FOR)" == "8"

+OPTDEFINES	= $(OPTDEFINES) /DTCL_MAJOR_VERSION=8

+!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

diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 56d2ba4..3980006 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -1199,15 +1199,14 @@ TcpSetOptionProc(
 
     if ((len > 1) && (optionName[1] == 'k') &&
 	    (strncmp(optionName, "-keepalive", len) == 0)) {
-	BOOL val;
-	int boolVar, rtn;
+	BOOL boolVar;
+	int rtn;
 
 	if (Tcl_GetBoolean(interp, value, &boolVar) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	val = boolVar ? TRUE : FALSE;
 	rtn = setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
-		(const char *) &val, sizeof(BOOL));
+		(const char *) &boolVar, sizeof(boolVar));
 	if (rtn != 0) {
 	    Tcl_WinConvertError(WSAGetLastError());
 	    if (interp) {
@@ -1221,15 +1220,14 @@ TcpSetOptionProc(
     }
     if ((len > 1) && (optionName[1] == 'n') &&
 	(strncmp(optionName, "-nodelay", len) == 0)) {
-	BOOL val;
-	int boolVar, rtn;
+	BOOL boolVar;
+	int rtn;
 
 	if (Tcl_GetBoolean(interp, value, &boolVar) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	val = boolVar ? TRUE : FALSE;
 	rtn = setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
-		(const char *) &val, sizeof(BOOL));
+		(const char *) &boolVar, sizeof(boolVar));
 	if (rtn != 0) {
 	    Tcl_WinConvertError(WSAGetLastError());
 	    if (interp) {