Merge 8.7

4 files changed, 11 insertions, 11 deletions

diff --git a/generic/tclClockFmt.c b/generic/tclClockFmt.c
index d4734d8..423b64a 100644
--- a/generic/tclClockFmt.c
+++ b/generic/tclClockFmt.c
@@ -2304,7 +2304,7 @@ ClockGetOrParseScanFormat(
 		    wordTok->tokWord.start = p;
 		    wordTok->map = &ScnWordTokenMap;
 		}
-		
+
 		do {
 		    if (isspace(UCHAR(*p))) {
 			fss->scnSpaceCount++;
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index 4ee8033..b7288b7 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -341,7 +341,7 @@ RingBufferInit(
     if (capacity <= 0 || capacity > TCL_SIZE_MAX) {
 	Tcl_Panic("Internal error: invalid ring buffer capacity requested.");
     }
-    ringPtr->bufPtr = (char *) Tcl_Alloc(capacity);
+    ringPtr->bufPtr = (char *)Tcl_Alloc(capacity);
     ringPtr->capacity = capacity;
     ringPtr->start    = 0;
     ringPtr->length   = 0;
@@ -2006,7 +2006,7 @@ AllocateConsoleHandleInfo(
     ConsoleHandleInfo *handleInfoPtr;
     DWORD consoleMode;
 
-    handleInfoPtr = (ConsoleHandleInfo *) Tcl_Alloc(sizeof(*handleInfoPtr));
+    handleInfoPtr = (ConsoleHandleInfo *)Tcl_Alloc(sizeof(*handleInfoPtr));
     memset(handleInfoPtr, 0, sizeof(*handleInfoPtr));
     handleInfoPtr->console = consoleHandle;
     InitializeSRWLock(&handleInfoPtr->lock);
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 70cf6ab..49f445d 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -399,7 +399,7 @@ InitializeHostName(
 
     *encodingPtr = Tcl_GetEncoding(NULL, "utf-8");
     *lengthPtr = Tcl_DStringLength(&ds);
-    *valuePtr = (char *) Tcl_Alloc(*lengthPtr + 1);
+    *valuePtr = (char *)Tcl_Alloc(*lengthPtr + 1);
     memcpy(*valuePtr, Tcl_DStringValue(&ds), *lengthPtr + 1);
     Tcl_DStringFree(&ds);
 }
@@ -2568,7 +2568,7 @@ SocketCheckProc(
 		statePtr->watchEvents | FD_CONNECT | FD_ACCEPT)
 		&& !GOT_BITS(statePtr->flags, SOCKET_PENDING)) {
 	    SET_BITS(statePtr->flags, SOCKET_PENDING);
-	    evPtr = (SocketEvent *) Tcl_Alloc(sizeof(SocketEvent));
+	    evPtr = (SocketEvent *)Tcl_Alloc(sizeof(SocketEvent));
 	    evPtr->header.proc = SocketEventProc;
 	    evPtr->socket = statePtr->sockets->fd;
 	    Tcl_QueueEvent((Tcl_Event *) evPtr, TCL_QUEUE_TAIL);
@@ -2843,7 +2843,7 @@ AddSocketInfoFd(
 	 * Add the first FD.
 	 */
 
-	statePtr->sockets = (TcpFdList *) Tcl_Alloc(sizeof(TcpFdList));
+	statePtr->sockets = (TcpFdList *)Tcl_Alloc(sizeof(TcpFdList));
 	fds = statePtr->sockets;
     } else {
 	/*
@@ -2854,7 +2854,7 @@ AddSocketInfoFd(
 	    fds = fds->next;
 	}
 
-	fds->next = (TcpFdList *) Tcl_Alloc(sizeof(TcpFdList));
+	fds->next = (TcpFdList *)Tcl_Alloc(sizeof(TcpFdList));
 	fds = fds->next;
     }
 
@@ -2887,7 +2887,7 @@ static TcpState *
 NewSocketInfo(
     SOCKET socket)
 {
-    TcpState *statePtr = (TcpState *) Tcl_Alloc(sizeof(TcpState));
+    TcpState *statePtr = (TcpState *)Tcl_Alloc(sizeof(TcpState));
 
     memset(statePtr, 0, sizeof(TcpState));
 
diff --git a/win/tclWinTest.c b/win/tclWinTest.c
index 753fe12..8832235 100644
--- a/win/tclWinTest.c
+++ b/win/tclWinTest.c
@@ -463,7 +463,7 @@ TestplatformChmod(
 	goto done;
     }
     aceEntry[nSids].sidLen = GetLengthSid(pTokenUser->User.Sid);
-    aceEntry[nSids].pSid = Tcl_Alloc(aceEntry[nSids].sidLen);
+    aceEntry[nSids].pSid = (PSID)Tcl_Alloc(aceEntry[nSids].sidLen);
     if (!CopySid(aceEntry[nSids].sidLen, aceEntry[nSids].pSid,
 	    pTokenUser->User.Sid)) {
 	Tcl_Free(aceEntry[nSids].pSid); /* Since we have not ++'ed nSids */
@@ -505,7 +505,7 @@ TestplatformChmod(
 	    goto done;
 	}
 	aceEntry[nSids].sidLen = GetLengthSid(pTokenGroup->PrimaryGroup);
-	aceEntry[nSids].pSid = Tcl_Alloc(aceEntry[nSids].sidLen);
+	aceEntry[nSids].pSid = (PSID)Tcl_Alloc(aceEntry[nSids].sidLen);
 	if (!CopySid(aceEntry[nSids].sidLen, aceEntry[nSids].pSid, pTokenGroup->PrimaryGroup)) {
 	    Tcl_Free(pTokenGroup);
 	    Tcl_Free(aceEntry[nSids].pSid); /* Since we have not ++'ed nSids */
@@ -535,7 +535,7 @@ TestplatformChmod(
 	    goto done;
 	}
 	aceEntry[nSids].sidLen = GetLengthSid(pWorldSid);
-	aceEntry[nSids].pSid = Tcl_Alloc(aceEntry[nSids].sidLen);
+	aceEntry[nSids].pSid = (PSID)Tcl_Alloc(aceEntry[nSids].sidLen);
 	if (!CopySid(aceEntry[nSids].sidLen, aceEntry[nSids].pSid, pWorldSid)) {
 	    LocalFree(pWorldSid);
 	    Tcl_Free(aceEntry[nSids].pSid); /* Since we have not ++'ed nSids */