Backout the "dullest commit ever" (not my words ....). It breaks the build.

JN: Many of those changes are actually good, but there are too many changes to be able to search for a bug somewhere. Feel free to re-apply, after assuring it's really only whitespace changes. (my advise: do that after 9.0b2)

16 files changed, 228 insertions, 239 deletions

diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index 1d83976..01fa6c3 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.c
@@ -432,8 +432,8 @@ TclWinDriveLetterForVolMountPoint(
 
 int
 TclWinCPUID(
-    int index,			/* Which CPUID value to retrieve. */
-    int *regsPtr)		/* Registers after the CPUID. */
+    int index,		/* Which CPUID value to retrieve. */
+    int *regsPtr)	/* Registers after the CPUID. */
 {
     int status = TCL_ERROR;
 
diff --git a/win/tclWinChan.c b/win/tclWinChan.c
index 75beedd..4c08464 100644
--- a/win/tclWinChan.c
+++ b/win/tclWinChan.c
@@ -384,7 +384,7 @@ FileEventProc(
 
 static int
 FileBlockProc(
-    void *instanceData,		/* Instance data for channel. */
+    void *instanceData,	/* Instance data for channel. */
     int mode)			/* TCL_MODE_BLOCKING or
 				 * TCL_MODE_NONBLOCKING. */
 {
@@ -423,7 +423,7 @@ FileBlockProc(
 
 static int
 FileCloseProc(
-    void *instanceData,		/* Pointer to FileInfo structure. */
+    void *instanceData,	/* Pointer to FileInfo structure. */
     TCL_UNUSED(Tcl_Interp *),
     int flags)
 {
@@ -473,7 +473,7 @@ FileCloseProc(
 	     * pointer on the thread local list.
 	     */
 
-	    FileThreadActionProc(fileInfoPtr, TCL_CHANNEL_THREAD_REMOVE);
+	    FileThreadActionProc(fileInfoPtr,TCL_CHANNEL_THREAD_REMOVE);
 	    break;
 	}
     }
@@ -501,7 +501,7 @@ FileCloseProc(
 
 static long long
 FileWideSeekProc(
-    void *instanceData,		/* File state. */
+    void *instanceData,	/* File state. */
     long long offset,		/* Offset to seek to. */
     int mode,			/* Relative to where should we seek? */
     int *errorCodePtr)		/* To store error code. */
@@ -553,7 +553,7 @@ FileWideSeekProc(
 
 static int
 FileTruncateProc(
-    void *instanceData,		/* File state. */
+    void *instanceData,	/* File state. */
     long long length)		/* Length to truncate at. */
 {
     FileInfo *infoPtr = (FileInfo *)instanceData;
@@ -629,7 +629,7 @@ FileTruncateProc(
 
 static int
 FileInputProc(
-    void *instanceData,		/* File state. */
+    void *instanceData,	/* File state. */
     char *buf,			/* Where to store data read. */
     int bufSize,		/* Num bytes available in buffer. */
     int *errorCode)		/* Where to store error code. */
@@ -684,7 +684,7 @@ FileInputProc(
 
 static int
 FileOutputProc(
-    void *instanceData,		/* File state. */
+    void *instanceData,	/* File state. */
     const char *buf,		/* The data buffer. */
     int toWrite,		/* How many bytes to write? */
     int *errorCode)		/* Where to store error code. */
@@ -731,7 +731,7 @@ FileOutputProc(
 
 static void
 FileWatchProc(
-    void *instanceData,		/* File state. */
+    void *instanceData,	/* File state. */
     int mask)			/* What events to watch for; OR-ed combination
 				 * of TCL_READABLE, TCL_WRITABLE and
 				 * TCL_EXCEPTION. */
@@ -770,9 +770,9 @@ FileWatchProc(
 
 static int
 FileGetHandleProc(
-    void *instanceData,		/* The file state. */
+    void *instanceData,	/* The file state. */
     int direction,		/* TCL_READABLE or TCL_WRITABLE */
-    void **handlePtr)		/* Where to store the handle.  */
+    void **handlePtr)	/* Where to store the handle.  */
 {
     FileInfo *infoPtr = (FileInfo *)instanceData;
 
@@ -891,8 +891,7 @@ StatOpenFile(
      */
 
     TclNewObj(dictObj);
-#define STORE_ELEM(name, value) \
-	StoreElementInDict(dictObj, name, value)
+#define STORE_ELEM(name, value) StoreElementInDict(dictObj, name, value)
 
     STORE_ELEM("dev",      Tcl_NewWideIntObj((long) dev));
     STORE_ELEM("ino",      Tcl_NewWideIntObj((long long) inode));
@@ -921,7 +920,7 @@ StatOpenFile(
 
 static int
 FileGetOptionProc(
-    void *instanceData,		/* The file state. */
+    void *instanceData,	/* The file state. */
     Tcl_Interp *interp,		/* For error reporting. */
     const char *optionName,	/* What option to read, or NULL for all. */
     Tcl_DString *dsPtr)		/* Where to write the value read. */
@@ -1219,7 +1218,7 @@ TclpOpenFileChannel(
 
 Tcl_Channel
 Tcl_MakeFileChannel(
-    void *rawHandle,		/* OS level handle */
+    void *rawHandle,	/* OS level handle */
     int mode)			/* OR'ed combination of TCL_READABLE and
 				 * TCL_WRITABLE to indicate file mode. */
 {
@@ -1467,8 +1466,8 @@ TclpGetDefaultStdChannel(
      * Set up the normal channel options for stdio handles.
      */
 
-    if (Tcl_SetChannelOption(NULL, channel, "-translation", "auto")!=TCL_OK ||
-	    Tcl_SetChannelOption(NULL, channel, "-buffering", bufMode)!=TCL_OK) {
+    if (Tcl_SetChannelOption(NULL,channel,"-translation","auto")!=TCL_OK ||
+	    Tcl_SetChannelOption(NULL,channel,"-buffering",bufMode)!=TCL_OK) {
 	Tcl_CloseEx(NULL, channel, 0);
 	return (Tcl_Channel) NULL;
     }
@@ -1688,7 +1687,7 @@ FileGetType(
     return type;
 }
 
-/*
+ /*
  *----------------------------------------------------------------------
  *
  * NativeIsComPort --
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index e655195..8b289b1 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -94,10 +94,10 @@ static int gInitialized = 0;
  * and bufPtr[0]:bufPtr[length - (size-start)].
  */
 typedef struct RingBuffer {
-    char *bufPtr;		/* Pointer to buffer storage */
-    Tcl_Size capacity;		/* Size of the buffer in RingBufferChar */
-    Tcl_Size start;		/* Start of the data within the buffer. */
-    Tcl_Size length;		/* Number of RingBufferChar*/
+    char *bufPtr;	/* Pointer to buffer storage */
+    Tcl_Size capacity;	/* Size of the buffer in RingBufferChar */
+    Tcl_Size start;	/* Start of the data within the buffer. */
+    Tcl_Size length;	/* Number of RingBufferChar*/
 } RingBuffer;
 #define RingBufferLength(ringPtr_) ((ringPtr_)->length)
 #define RingBufferHasFreeSpace(ringPtr_) ((ringPtr_)->length < (ringPtr_)->capacity)
@@ -125,28 +125,25 @@ typedef struct RingBuffer {
  * from gConsoleHandleInfoList.
  */
 typedef struct ConsoleHandleInfo {
-    struct ConsoleHandleInfo *nextPtr;
-				/* Process-global list of consoles */
-    HANDLE console;		/* Console handle */
-    HANDLE consoleThread;	/* Handle to thread doing actual i/o on the
-				 * console */
-    SRWLOCK lock;		/* Controls access to this structure.
-				 * Cheaper than CRITICAL_SECTION but note does
-				 * not support recursive locks or Try* style
-				 * attempts.*/
+    struct ConsoleHandleInfo *nextPtr; /* Process-global list of consoles */
+    HANDLE console;       /* Console handle */
+    HANDLE consoleThread; /* Handle to thread doing actual i/o on the console */
+    SRWLOCK lock;	  /* Controls access to this structure.
+			   * Cheaper than CRITICAL_SECTION but note does not
+			   * support recursive locks or Try* style attempts.*/
     CONDITION_VARIABLE consoleThreadCV;/* For awakening console thread */
     CONDITION_VARIABLE interpThreadCV; /* For awakening interpthread(s) */
-    RingBuffer buffer;		/* Buffer for data transferred between console
-				 * threads and Tcl threads. For input consoles,
-				 * written by the console thread and read by Tcl
-				 * threads. The converse for output threads */
-    DWORD initMode;		/* Initial console mode. */
-    DWORD lastError;		/* An error caused by the last background
-				 * operation. Set to 0 if no error has been
-				 * detected. */
-    int numRefs;		/* See comments above */
-    int permissions;		/* TCL_READABLE for input consoles, TCL_WRITABLE
-				 * for output. Only one or the other can be set. */
+    RingBuffer buffer;	  /* Buffer for data transferred between console
+			   * threads and Tcl threads. For input consoles,
+			   * written by the console thread and read by Tcl
+			   * threads. The converse for output threads */
+    DWORD initMode;	  /* Initial console mode. */
+    DWORD lastError;	  /* An error caused by the last background
+			   * operation. Set to 0 if no error has been
+			   * detected. */
+    int numRefs;	  /* See comments above */
+    int permissions;	  /* TCL_READABLE for input consoles, TCL_WRITABLE
+			   * for output. Only one or the other can be set. */
     int flags;
 #define CONSOLE_DATA_AWAITED 0x0001 /* An interpreter is awaiting data */
 } ConsoleHandleInfo;
@@ -186,7 +183,7 @@ typedef struct ConsoleChannelInfo {
     Tcl_Channel channel;	/* Pointer to channel structure. */
     DWORD initMode;		/* Initial console mode. */
     int numRefs;		/* See comments above */
-    int permissions;		/* OR'ed combination of TCL_READABLE,
+    int permissions;            /* OR'ed combination of TCL_READABLE,
 				 * TCL_WRITABLE, or TCL_EXCEPTION: indicates
 				 * which operations are valid on the file. */
     int watchMask;		/* OR'ed combination of TCL_READABLE,
@@ -301,23 +298,23 @@ static ConsoleChannelInfo *gWatchingChannelList;
  */
 
 static const Tcl_ChannelType consoleChannelType = {
-    "console",			/* Type name. */
-    TCL_CHANNEL_VERSION_5,	/* v5 channel */
-    NULL,			/* Old close proc. Deprecated */
-    ConsoleInputProc,		/* Input proc. */
-    ConsoleOutputProc,		/* Output proc. */
-    NULL,			/* Seek proc. Not seekable. Deprecated */
-    ConsoleSetOptionProc,	/* Set option proc. */
-    ConsoleGetOptionProc,	/* Get option proc. */
-    ConsoleWatchProc,		/* Set up notifier to watch the channel. */
-    ConsoleGetHandleProc,	/* Get an OS handle from channel. */
-    ConsoleCloseProc,		/* New close2 proc. */
-    ConsoleBlockModeProc,	/* Set blocking or non-blocking mode. */
-    NULL,			/* Flush proc. */
-    NULL,			/* Handler proc. */
-    NULL,			/* Wide seek proc. Not seekable */
-    ConsoleThreadActionProc,	/* Thread action proc. */
-    NULL			/* Truncation proc. */
+    "console",               /* Type name. */
+    TCL_CHANNEL_VERSION_5,   /* v5 channel */
+    NULL,                    /* Close proc. */
+    ConsoleInputProc,        /* Input proc. */
+    ConsoleOutputProc,       /* Output proc. */
+    NULL,                    /* Seek proc. */
+    ConsoleSetOptionProc,    /* Set option proc. */
+    ConsoleGetOptionProc,    /* Get option proc. */
+    ConsoleWatchProc,        /* Set up notifier to watch the channel. */
+    ConsoleGetHandleProc,    /* Get an OS handle from channel. */
+    ConsoleCloseProc,        /* close2proc. */
+    ConsoleBlockModeProc,    /* Set blocking or non-blocking mode. */
+    NULL,                    /* Flush proc. */
+    NULL,                    /* Handler proc. */
+    NULL,                    /* Wide seek proc. */
+    ConsoleThreadActionProc, /* Thread action proc. */
+    NULL                     /* Truncation proc. */
 };
 
 /*
@@ -757,8 +754,8 @@ NudgeWatchers(
  *
  *	This procedure is invoked before Tcl_DoOneEvent blocks waiting for an
  *	event. It walks the channel list and if any input channel has data
- *	available or output channel has space for data, sets the event loop
- *	blocking time to 0 so that it will poll immediately.
+ *      available or output channel has space for data, sets the event loop
+ *      blocking time to 0 so that it will poll immediately.
  *
  * Results:
  *	None.
@@ -2002,13 +1999,13 @@ ConsoleWriterThread(
  */
 static ConsoleHandleInfo *
 AllocateConsoleHandleInfo(
-    HANDLE consoleHandle,	/* Actual handle to console. */
-    int permissions)		/* TCL_READABLE or TCL_WRITABLE */
+    HANDLE consoleHandle,
+    int permissions)   /* TCL_READABLE or TCL_WRITABLE */
 {
     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);
@@ -2026,14 +2023,12 @@ AllocateConsoleHandleInfo(
 	SetConsoleMode(consoleHandle, consoleMode);
     }
     handleInfoPtr->consoleThread = CreateThread(
-	    NULL,		/* default security descriptor */
-	    2 * CONSOLE_BUFFER_SIZE, /* Stack size, rounded up to granularity */
-	    permissions == TCL_READABLE
-		    ? ConsoleReaderThread
-		    : ConsoleWriterThread,
-	    handleInfoPtr,	/* Pass to thread */
-	    0,			/* Flags - no special cases */
-	    NULL);		/* Don't care about thread id */
+	NULL, /* default security descriptor */
+	2*CONSOLE_BUFFER_SIZE, /* Stack size - gets rounded up to granularity */
+	permissions == TCL_READABLE ? ConsoleReaderThread : ConsoleWriterThread,
+	handleInfoPtr, /* Pass to thread */
+	0,             /* Flags - no special cases */
+	NULL);         /* Don't care about thread id */
     if (handleInfoPtr->consoleThread == NULL) {
 	/* Note - SRWLock and condition variables do not need finalization */
 	RingBufferClear(&handleInfoPtr->buffer);
@@ -2262,7 +2257,7 @@ ConsoleThreadActionProc(
  */
 static int
 ConsoleSetOptionProc(
-    void *instanceData,		/* File state. */
+    void *instanceData,	/* File state. */
     Tcl_Interp *interp,		/* For error reporting - can be NULL. */
     const char *optionName,	/* Which option to set? */
     const char *value)		/* New value for option. */
@@ -2351,7 +2346,7 @@ ConsoleSetOptionProc(
 
 static int
 ConsoleGetOptionProc(
-    void *instanceData,		/* File state. */
+    void *instanceData,	/* File state. */
     Tcl_Interp *interp,		/* For error reporting - can be NULL. */
     const char *optionName,	/* Option to get. */
     Tcl_DString *dsPtr)		/* Where to store value(s). */
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 86fde1a..f36407d 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -92,10 +92,8 @@ TCL_DECLARE_MUTEX(ddeMutex)
 
 #if (TCL_MAJOR_VERSION < 9) && defined(TCL_MINOR_VERSION) && (TCL_MINOR_VERSION < 7)
 # if TCL_UTF_MAX > 3
-#   define Tcl_WCharToUtfDString(a, b, c) \
-	Tcl_WinTCharToUtf((TCHAR *)(a), (b) * sizeof(WCHAR), c)
-#   define Tcl_UtfToWCharDString(a, b, c) \
-	(WCHAR *)Tcl_WinUtfToTChar(a, b, c)
+#   define Tcl_WCharToUtfDString(a,b,c) Tcl_WinTCharToUtf((TCHAR *)(a),(b)*sizeof(WCHAR),c)
+#   define Tcl_UtfToWCharDString(a,b,c) (WCHAR *)Tcl_WinUtfToTChar(a,b,c)
 # else
 #   define Tcl_WCharToUtfDString Tcl_UniCharToUtfDString
 #   define Tcl_UtfToWCharDString Tcl_UtfToUniCharDString
@@ -312,10 +310,10 @@ Initialize(void)
 static const WCHAR *
 DdeSetServerName(
     Tcl_Interp *interp,
-    const WCHAR *name,		/* The name that will be used to refer to the
+    const WCHAR *name, /* The name that will be used to refer to the
 				 * interpreter in later "send" commands. Must
 				 * be globally unique. */
-    int flags,			/* DDE_FLAG_FORCE or 0 */
+    int flags,		/* DDE_FLAG_FORCE or 0 */
     Tcl_Obj *handlerPtr)	/* Name of the optional proc/command to handle
 				 * incoming Dde eval's */
 {
@@ -517,7 +515,7 @@ DdeGetRegistrationPtr(
 
 static void
 DeleteProc(
-    void *clientData)		/* The interp we are deleting. */
+    void *clientData)	/* The interp we are deleting. */
 {
     RegisteredInterp *riPtr = (RegisteredInterp *) clientData;
     RegisteredInterp *searchPtr, *prevPtr;
@@ -1305,9 +1303,9 @@ SetDdeError(
 
 static int
 DdeObjCmd(
-    void *dummy,		/* Not used. */
+    void *dummy,	/* Not used. */
     Tcl_Interp *interp,		/* The interp we are sending from */
-    Tcl_Size objc,		/* Number of arguments */
+    Tcl_Size objc,			/* Number of arguments */
     Tcl_Obj *const *objv)	/* The arguments */
 {
     static const char *const ddeCommands[] = {
@@ -1326,7 +1324,7 @@ DdeObjCmd(
 	"-async", "-binary", NULL
     };
     enum DdeExecOptions {
-	DDE_EXEC_ASYNC, DDE_EXEC_BINARY
+        DDE_EXEC_ASYNC, DDE_EXEC_BINARY
     };
     static const char *const ddeEvalOptions[] = {
 	"-async", NULL
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c
index b6db893..0af484d 100644
--- a/win/tclWinFCmd.c
+++ b/win/tclWinFCmd.c
@@ -904,8 +904,8 @@ TclpObjCopyDirectory(
     Tcl_Obj *normSrcPtr, *normDestPtr;
     int ret;
 
-    normSrcPtr = Tcl_FSGetNormalizedPath(NULL, srcPathPtr);
-    normDestPtr = Tcl_FSGetNormalizedPath(NULL, destPathPtr);
+    normSrcPtr = Tcl_FSGetNormalizedPath(NULL,srcPathPtr);
+    normDestPtr = Tcl_FSGetNormalizedPath(NULL,destPathPtr);
     if ((normSrcPtr == NULL) || (normDestPtr == NULL)) {
 	return TCL_ERROR;
     }
@@ -1711,8 +1711,8 @@ ConvertFileNameFormat(
 	    Tcl_WCharToUtfDString(nativeName, TCL_INDEX_NONE, &dsTemp);
 	    Tcl_DStringFree(&ds);
 
-	    tempPath = Tcl_DStringToObj(&dsTemp);
-	    Tcl_ListObjReplace(NULL, splitPath, i, 1, 1, &tempPath);
+            tempPath = Tcl_DStringToObj(&dsTemp);
+            Tcl_ListObjReplace(NULL, splitPath, i, 1, 1, &tempPath);
 	    FindClose(handle);
 	}
     }
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 2f43ed2..17f4898 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -497,8 +497,7 @@ TclWinSymLinkDelete(
 
     if (hFile != INVALID_HANDLE_VALUE) {
 	if (!DeviceIoControl(hFile, FSCTL_DELETE_REPARSE_POINT, reparseBuffer,
-		REPARSE_MOUNTPOINT_HEADER_SIZE, NULL, 0, &returnedLength,
-		NULL)) {
+		REPARSE_MOUNTPOINT_HEADER_SIZE,NULL,0,&returnedLength,NULL)) {
 	    /*
 	     * Error setting junction.
 	     */
@@ -584,7 +583,7 @@ WinReadLinkDirectory(
 	     */
 
 	    if (wcsncmp(reparseBuffer->MountPointReparseBuffer.PathBuffer,
-		    L"\\??\\Volume{", 11) == 0) {
+		    L"\\??\\Volume{",11) == 0) {
 		char drive;
 
 		/*
@@ -607,7 +606,7 @@ WinReadLinkDirectory(
 		    };
 
 		    driveSpec[0] = drive;
-		    retVal = Tcl_NewStringObj(driveSpec, 2);
+		    retVal = Tcl_NewStringObj(driveSpec,2);
 		    Tcl_IncrRefCount(retVal);
 		    return retVal;
 		}
@@ -624,14 +623,14 @@ WinReadLinkDirectory(
 
 		goto invalidError;
 	    } else if (wcsncmp(reparseBuffer->MountPointReparseBuffer
-		    .PathBuffer, L"\\\\?\\", 4) == 0) {
+		    .PathBuffer, L"\\\\?\\",4) == 0) {
 		/*
 		 * Strip off the prefix.
 		 */
 
 		offset = 4;
 	    } else if (wcsncmp(reparseBuffer->MountPointReparseBuffer
-		    .PathBuffer, L"\\??\\", 4) == 0) {
+		    .PathBuffer, L"\\??\\",4) == 0) {
 		/*
 		 * Strip off the prefix.
 		 */
@@ -646,9 +645,9 @@ WinReadLinkDirectory(
 		reparseBuffer->MountPointReparseBuffer
 		.SubstituteNameLength>>1, &ds);
 
-	copy = Tcl_DStringValue(&ds) + offset;
-	len = Tcl_DStringLength(&ds) - offset;
-	retVal = Tcl_NewStringObj(copy, len);
+	copy = Tcl_DStringValue(&ds)+offset;
+	len = Tcl_DStringLength(&ds)-offset;
+	retVal = Tcl_NewStringObj(copy,len);
 	Tcl_IncrRefCount(retVal);
 	Tcl_DStringFree(&ds);
 	return retVal;
@@ -1439,23 +1438,23 @@ TclpGetUserHome(
     if (domain == NULL) {
 	const char *ptr;
 
-	/*
-	 * Treat the current user as a special case because the general case
-	 * below does not properly retrieve the path. The NetUserGetInfo
-	 * call returns an empty path and the code defaults to the user's
-	 * name in the profiles directory. On modern Windows systems, this
-	 * is generally wrong as when the account is a Microsoft account,
-	 * for example abcdefghi@outlook.com, the directory name is
-	 * abcde and not abcdefghi.
-	 *
-	 * Note we could have just used env(USERPROFILE) here but
-	 * the intent is to retrieve (as on Unix) the system's view
-	 * of the home irrespective of environment settings of HOME
-	 * and USERPROFILE.
-	 *
-	 * Fixing this for the general user needs more investigating but
-	 * at least for the current user we can use a direct call.
-	 */
+        /*
+         * Treat the current user as a special case because the general case
+         * below does not properly retrieve the path. The NetUserGetInfo
+         * call returns an empty path and the code defaults to the user's
+         * name in the profiles directory. On modern Windows systems, this
+         * is generally wrong as when the account is a Microsoft account,
+         * for example abcdefghi@outlook.com, the directory name is
+         * abcde and not abcdefghi.
+         *
+         * Note we could have just used env(USERPROFILE) here but
+         * the intent is to retrieve (as on Unix) the system's view
+         * of the home irrespective of environment settings of HOME
+         * and USERPROFILE.
+         *
+         * Fixing this for the general user needs more investigating but
+         * at least for the current user we can use a direct call.
+         */
 	ptr = TclpGetUserName(&ds);
 	if (ptr != NULL && strcasecmp(name, ptr) == 0) {
 	    HANDLE hProcess;
@@ -1750,8 +1749,8 @@ NativeAccess(
 	 * go).
 	 */
 
-	if(!GetSecurityDescriptorOwner(sdPtr, &pSid, &SidDefaulted) ||
-	   memcmp(GetSidIdentifierAuthority(pSid), &samba_unmapped,
+	if(!GetSecurityDescriptorOwner(sdPtr,&pSid,&SidDefaulted) ||
+	   memcmp(GetSidIdentifierAuthority(pSid),&samba_unmapped,
 		  sizeof(SID_IDENTIFIER_AUTHORITY))==0) {
 	    HeapFree(GetProcessHeap(), 0, sdPtr);
 	    return 0; /* Attrib tests say access allowed. */
@@ -1894,7 +1893,7 @@ NativeIsExec(
 
 int
 TclpObjChdir(
-    Tcl_Obj *pathPtr)		/* Path to new working directory. */
+    Tcl_Obj *pathPtr)	/* Path to new working directory. */
 {
     int result;
     const WCHAR *nativePath;
@@ -2054,28 +2053,28 @@ NativeStat(
     if (fileHandle != INVALID_HANDLE_VALUE) {
 	BY_HANDLE_FILE_INFORMATION data;
 
-	if (GetFileInformationByHandle(fileHandle, &data) != TRUE) {
-	    fileType = GetFileType(fileHandle);
-	    CloseHandle(fileHandle);
-	    if (fileType != FILE_TYPE_CHAR && fileType != FILE_TYPE_DISK) {
-		Tcl_SetErrno(ENOENT);
-		return -1;
-	    }
+	if (GetFileInformationByHandle(fileHandle,&data) != TRUE) {
+            fileType = GetFileType(fileHandle);
+            CloseHandle(fileHandle);
+            if (fileType != FILE_TYPE_CHAR && fileType != FILE_TYPE_DISK) {
+                Tcl_SetErrno(ENOENT);
+                return -1;
+            }
 
-	    /*
+            /*
 	     * Mock up the expected structure
 	     */
 
-	    memset(&data, 0, sizeof(data));
-	    statPtr->st_atime = 0;
-	    statPtr->st_mtime = 0;
-	    statPtr->st_ctime = 0;
-	} else {
-	    CloseHandle(fileHandle);
-	    statPtr->st_atime = ToCTime(data.ftLastAccessTime);
-	    statPtr->st_mtime = ToCTime(data.ftLastWriteTime);
-	    statPtr->st_ctime = ToCTime(data.ftCreationTime);
-	}
+            memset(&data, 0, sizeof(data));
+            statPtr->st_atime = 0;
+            statPtr->st_mtime = 0;
+            statPtr->st_ctime = 0;
+        } else {
+            CloseHandle(fileHandle);
+            statPtr->st_atime = ToCTime(data.ftLastAccessTime);
+            statPtr->st_mtime = ToCTime(data.ftLastWriteTime);
+            statPtr->st_ctime = ToCTime(data.ftCreationTime);
+        }
 	attr = data.dwFileAttributes;
 	statPtr->st_size = ((long long) data.nFileSizeLow) |
 		(((long long) data.nFileSizeHigh) << 32);
@@ -2135,11 +2134,11 @@ NativeStat(
     dev = NativeDev(nativePath);
     mode = NativeStatMode(attr, checkLinks, NativeIsExec(nativePath));
     if (fileType == FILE_TYPE_CHAR) {
-	mode &= ~S_IFMT;
-	mode |= S_IFCHR;
+        mode &= ~S_IFMT;
+        mode |= S_IFCHR;
     } else if (fileType == FILE_TYPE_DISK) {
-	mode &= ~S_IFMT;
-	mode |= S_IFBLK;
+        mode &= ~S_IFMT;
+        mode |= S_IFBLK;
     }
 
     statPtr->st_dev	= (dev_t) dev;
@@ -2521,9 +2520,9 @@ TclpFilesystemPathType(
 int
 TclpObjNormalizePath(
     TCL_UNUSED(Tcl_Interp *),
-    Tcl_Obj *pathPtr,		/* An unshared object containing the path to
+    Tcl_Obj *pathPtr,	        /* An unshared object containing the path to
 				 * normalize */
-    int nextCheckpoint)		/* offset to start at in pathPtr */
+    int nextCheckpoint)	        /* offset to start at in pathPtr */
 {
     char *lastValidPathEnd = NULL;
     Tcl_DString dsNorm;		/* This will hold the normalized string. */
@@ -2871,7 +2870,7 @@ TclWinVolumeRelativeNormalize(
 
 	const char *drive = TclGetString(useThisCwd);
 
-	absolutePath = Tcl_NewStringObj(drive, 2);
+	absolutePath = Tcl_NewStringObj(drive,2);
 	Tcl_AppendToObj(absolutePath, path, TCL_INDEX_NONE);
 	Tcl_IncrRefCount(absolutePath);
 
@@ -2973,10 +2972,10 @@ TclpNativeToNormalized(
      */
 
     if (*copy == '\\') {
-	if (0 == strncmp(copy, "\\??\\", 4)) {
+	if (0 == strncmp(copy,"\\??\\",4)) {
 	    copy += 4;
 	    len -= 4;
-	} else if (0 == strncmp(copy, "\\\\?\\", 4)) {
+	} else if (0 == strncmp(copy,"\\\\?\\",4)) {
 	    copy += 4;
 	    len -= 4;
 	}
@@ -2992,7 +2991,7 @@ TclpNativeToNormalized(
 	}
     }
 
-    objPtr = Tcl_NewStringObj(copy, len);
+    objPtr = Tcl_NewStringObj(copy,len);
     Tcl_DStringFree(&ds);
 
     return objPtr;
@@ -3258,8 +3257,8 @@ TclpUtime(
  * TclWinFileOwned --
  *
  *	Returns 1 if the specified file exists and is owned by the current
- *	user and 0 otherwise. Like the Unix case, the check is made using
- *	the real process SID, not the effective (impersonation) one.
+ *      user and 0 otherwise. Like the Unix case, the check is made using
+ *      the real process SID, not the effective (impersonation) one.
  *
  *---------------------------------------------------------------------------
  */
@@ -3281,12 +3280,12 @@ TclWinFileOwned(
     if (GetNamedSecurityInfoW((LPWSTR) native, SE_FILE_OBJECT,
 	    OWNER_SECURITY_INFORMATION, &ownerSid, NULL, NULL, NULL,
 	    &secd) != ERROR_SUCCESS) {
-	/*
+        /*
 	 * Either not a file, or we do not have access to it in which case we
 	 * are in all likelihood not the owner.
 	 */
 
-	return 0;
+        return 0;
     }
 
     /*
@@ -3297,19 +3296,19 @@ TclWinFileOwned(
      */
 
     if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) {
-	/*
+        /*
 	 * Find out how big the buffer needs to be.
 	 */
 
-	bufsz = 0;
-	GetTokenInformation(token, TokenUser, NULL, 0, &bufsz);
-	if (bufsz) {
-	    buf = (LPBYTE)Tcl_Alloc(bufsz);
-	    if (GetTokenInformation(token, TokenUser, buf, bufsz, &bufsz)) {
-		owned = EqualSid(ownerSid, ((PTOKEN_USER) buf)->User.Sid);
-	    }
-	}
-	CloseHandle(token);
+        bufsz = 0;
+        GetTokenInformation(token, TokenUser, NULL, 0, &bufsz);
+        if (bufsz) {
+            buf = (LPBYTE)Tcl_Alloc(bufsz);
+            if (GetTokenInformation(token, TokenUser, buf, bufsz, &bufsz)) {
+                owned = EqualSid(ownerSid, ((PTOKEN_USER) buf)->User.Sid);
+            }
+        }
+        CloseHandle(token);
     }
 
     /*
@@ -3317,13 +3316,13 @@ TclWinFileOwned(
      */
 
     if (secd) {
-	LocalFree(secd);	/* Also frees ownerSid */
+        LocalFree(secd);            /* Also frees ownerSid */
     }
     if (buf) {
-	Tcl_Free(buf);
+        Tcl_Free(buf);
     }
 
-    return (owned != 0);	/* Convert non-0 to 1 */
+    return (owned != 0);        /* Convert non-0 to 1 */
 }
 
 /*
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index ac26a81..4234ceb 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -516,14 +516,14 @@ TclpSetVariables(
 	    Tcl_SetVar2(interp, "env", "HOME", Tcl_DStringValue(&ds),
 		    TCL_GLOBAL_ONLY);
 	} else {
-	    /* None of HOME, HOMEDRIVE, HOMEPATH exists. Try USERPROFILE */
-	    ptr = Tcl_GetVar2(interp, "env", "USERPROFILE", TCL_GLOBAL_ONLY);
-	    if (ptr != NULL && ptr[0]) {
-		Tcl_SetVar2(interp, "env", "HOME", ptr, TCL_GLOBAL_ONLY);
-	    } else {
-		/* Last resort */
-		Tcl_SetVar2(interp, "env", "HOME", "c:\\", TCL_GLOBAL_ONLY);
-	    }
+            /* None of HOME, HOMEDRIVE, HOMEPATH exists. Try USERPROFILE */
+            ptr = Tcl_GetVar2(interp, "env", "USERPROFILE", TCL_GLOBAL_ONLY);
+            if (ptr != NULL && ptr[0]) {
+                Tcl_SetVar2(interp, "env", "HOME", ptr, TCL_GLOBAL_ONLY);
+            } else {
+                /* Last resort */
+                Tcl_SetVar2(interp, "env", "HOME", "c:\\", TCL_GLOBAL_ONLY);
+            }
 	}
     }
 
@@ -542,7 +542,7 @@ TclpSetVariables(
      * Define what the platform PATH separator is. [TIP #315]
      */
 
-    Tcl_SetVar2(interp, "tcl_platform", "pathSeparator", ";", TCL_GLOBAL_ONLY);
+    Tcl_SetVar2(interp, "tcl_platform","pathSeparator", ";", TCL_GLOBAL_ONLY);
 }
 
 /*
@@ -570,7 +570,7 @@ Tcl_Size
 TclpFindVariable(
     const char *name,		/* Name of desired environment variable
 				 * (UTF-8). */
-    Tcl_Size *lengthPtr)	/* Used to return length of name (for
+    Tcl_Size *lengthPtr)		/* Used to return length of name (for
 				 * successful searches) or number of non-NULL
 				 * entries in environ (for unsuccessful
 				 * searches). */
diff --git a/win/tclWinInt.h b/win/tclWinInt.h
index 4456d53..9995602 100644
--- a/win/tclWinInt.h
+++ b/win/tclWinInt.h
@@ -51,7 +51,7 @@ MODULE_SCOPE int	TclWinSymLinkCopyDirectory(const WCHAR *LinkOriginal,
 			    const WCHAR *LinkCopy);
 MODULE_SCOPE int	TclWinSymLinkDelete(const WCHAR *LinkOriginal,
 			    int linkOnly);
-MODULE_SCOPE int	TclWinFileOwned(Tcl_Obj *);
+MODULE_SCOPE int        TclWinFileOwned(Tcl_Obj *);
 MODULE_SCOPE void	TclWinGenerateChannelName(char channelName[],
 			    const char *channelTypeName, void *channelImpl);
 MODULE_SCOPE const char*TclpGetUserName(Tcl_DString *bufferPtr);
diff --git a/win/tclWinLoad.c b/win/tclWinLoad.c
index d406c7f..1cc7ae1 100644
--- a/win/tclWinLoad.c
+++ b/win/tclWinLoad.c
@@ -90,11 +90,11 @@ TclpDlopen(
 
 	Tcl_DString ds;
 
-	/*
-	 * Remember the first error on load attempt to be used if the
-	 * second load attempt below also fails.
-	 */
-	firstError = (nativeName == NULL) ?
+        /*
+         * Remember the first error on load attempt to be used if the
+         * second load attempt below also fails.
+        */
+        firstError = (nativeName == NULL) ?
 		ERROR_MOD_NOT_FOUND : GetLastError();
 
 	Tcl_DStringInit(&ds);
@@ -106,19 +106,19 @@ TclpDlopen(
 
     if (hInstance == NULL) {
 	DWORD lastError;
-	Tcl_Obj *errMsg;
-
-	/*
-	 * We choose to only use the error from the second call if the first
-	 * call failed due to the file not being found. Else stick to the
-	 * first error for reporting purposes.
-	 */
-	if (firstError == ERROR_MOD_NOT_FOUND ||
+        Tcl_Obj *errMsg;
+
+        /*
+         * We choose to only use the error from the second call if the first
+         * call failed due to the file not being found. Else stick to the
+         * first error for reporting purposes.
+         */
+        if (firstError == ERROR_MOD_NOT_FOUND ||
 		firstError == ERROR_DLL_NOT_FOUND) {
-	    lastError = GetLastError();
-	} else {
-	    lastError = firstError;
-	}
+            lastError = GetLastError();
+        } else {
+            lastError = firstError;
+        }
 
 	errMsg = Tcl_ObjPrintf("couldn't load library \"%s\": ",
 		TclGetString(pathPtr));
@@ -157,11 +157,11 @@ TclpDlopen(
 		Tcl_AppendToObj(errMsg, "the library initialization"
 			" routine failed", TCL_INDEX_NONE);
 		break;
-	    case ERROR_BAD_EXE_FORMAT:
+            case ERROR_BAD_EXE_FORMAT:
 		Tcl_SetErrorCode(interp, "WIN_LOAD", "BAD_EXE_FORMAT", (char *)NULL);
 		Tcl_AppendToObj(errMsg, "Bad exe format. Possibly a 32/64-bit mismatch.", TCL_INDEX_NONE);
-		break;
-	    default:
+                break;
+            default:
 		Tcl_WinConvertError(lastError);
 		Tcl_AppendToObj(errMsg, Tcl_PosixError(interp), TCL_INDEX_NONE);
 	    }
diff --git a/win/tclWinNotify.c b/win/tclWinNotify.c
index dbeea14..2c93a41 100644
--- a/win/tclWinNotify.c
+++ b/win/tclWinNotify.c
@@ -148,7 +148,7 @@ TclpInitNotifier(void)
 
 void
 TclpFinalizeNotifier(
-    void *clientData)		/* Pointer to notifier data. */
+    void *clientData)	/* Pointer to notifier data. */
 {
     ThreadSpecificData *tsdPtr = (ThreadSpecificData *) clientData;
 
@@ -218,7 +218,7 @@ TclpFinalizeNotifier(
 
 void
 TclpAlertNotifier(
-    void *clientData)		/* Pointer to thread data. */
+    void *clientData)	/* Pointer to thread data. */
 {
     ThreadSpecificData *tsdPtr = (ThreadSpecificData *) clientData;
 
@@ -264,7 +264,7 @@ TclpAlertNotifier(
 
 void
 TclpSetTimer(
-    const Tcl_Time *timePtr)	/* Maximum block time, or NULL. */
+    const Tcl_Time *timePtr)		/* Maximum block time, or NULL. */
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
     UINT timeout;
@@ -370,9 +370,9 @@ int
 TclAsyncNotifier(
     TCL_UNUSED(int),		/* Signal number. */
     TCL_UNUSED(Tcl_ThreadId),	/* Target thread. */
-    TCL_UNUSED(void *),		/* Notifier data. */
+    TCL_UNUSED(void *),	/* Notifier data. */
     TCL_UNUSED(int *),		/* Flag to mark. */
-    TCL_UNUSED(int))		/* Value of mark. */
+    TCL_UNUSED(int))			/* Value of mark. */
 {
     return 0;
 }
@@ -464,7 +464,7 @@ TclpNotifierData(void)
 
 int
 TclpWaitForEvent(
-    const Tcl_Time *timePtr)	/* Maximum block time, or NULL. */
+    const Tcl_Time *timePtr)		/* Maximum block time, or NULL. */
 {
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
     MSG msg;
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index 1f80e7a..dbf3324 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -203,7 +203,7 @@ static void		PipeThreadActionProc(void *instanceData,
 static const Tcl_ChannelType pipeChannelType = {
     "pipe",			/* Type name. */
     TCL_CHANNEL_VERSION_5,	/* v5 channel */
-    NULL,			/* Close proc. */
+    NULL,		/* Close proc. */
     PipeInputProc,		/* Input proc. */
     PipeOutputProc,		/* Output proc. */
     NULL,			/* Seek proc. */
@@ -916,7 +916,7 @@ TclpCreateProcess(
 				 * occurred when creating the child process.
 				 * Error messages from the child process
 				 * itself are sent to errorFile. */
-    size_t argc,		/* Number of arguments in following array. */
+    size_t argc,			/* Number of arguments in following array. */
     const char **argv,		/* Array of argument strings. argv[0] contains
 				 * the name of the executable converted to
 				 * native format (using the
@@ -1540,7 +1540,7 @@ static void
 BuildCommandLine(
     const char *executable,	/* Full path of executable (including
 				 * extension). Replacement for argv[0]. */
-    size_t argc,		/* Number of arguments. */
+    size_t argc,			/* Number of arguments. */
     const char **argv,		/* Argument strings in UTF. */
     Tcl_DString *linePtr)	/* Initialized Tcl_DString that receives the
 				 * command line (WCHAR). */
@@ -1957,7 +1957,7 @@ TclGetAndDetachPids(
 
 static int
 PipeBlockModeProc(
-    void *instanceData,		/* Instance data for channel. */
+    void *instanceData,	/* Instance data for channel. */
     int mode)			/* TCL_MODE_BLOCKING or
 				 * TCL_MODE_NONBLOCKING. */
 {
@@ -1996,7 +1996,7 @@ PipeBlockModeProc(
 
 static int
 PipeClose2Proc(
-    void *instanceData,		/* Pointer to PipeInfo structure. */
+    void *instanceData,	/* Pointer to PipeInfo structure. */
     Tcl_Interp *interp,		/* For error reporting. */
     int flags)			/* Flags that indicate which side to close. */
 {
@@ -2167,7 +2167,7 @@ PipeClose2Proc(
 
 static int
 PipeInputProc(
-    void *instanceData,		/* Pipe state. */
+    void *instanceData,	/* Pipe state. */
     char *buf,			/* Where to store data read. */
     int bufSize,		/* How much space is available in the
 				 * buffer? */
@@ -2261,7 +2261,7 @@ PipeInputProc(
 
 static int
 PipeOutputProc(
-    void *instanceData,		/* Pipe state. */
+    void *instanceData,	/* Pipe state. */
     const char *buf,		/* The data buffer. */
     int toWrite,		/* How many bytes to write? */
     int *errorCode)		/* Where to store error code. */
@@ -2409,7 +2409,7 @@ PipeEventProc(
 	mask = TCL_WRITABLE;
     }
 
-    if ((infoPtr->watchMask & TCL_READABLE) && (WaitForRead(infoPtr, 0) >= 0)) {
+    if ((infoPtr->watchMask & TCL_READABLE) && (WaitForRead(infoPtr,0) >= 0)) {
 	if (infoPtr->readFlags & PIPE_EOF) {
 	    mask = TCL_READABLE;
 	} else {
@@ -2443,7 +2443,7 @@ PipeEventProc(
 
 static void
 PipeWatchProc(
-    void *instanceData,		/* Pipe state. */
+    void *instanceData,	/* Pipe state. */
     int mask)			/* What events to watch for, OR-ed combination
 				 * of TCL_READABLE, TCL_WRITABLE and
 				 * TCL_EXCEPTION. */
@@ -2505,9 +2505,9 @@ PipeWatchProc(
 
 static int
 PipeGetHandleProc(
-    void *instanceData,		/* The pipe state. */
+    void *instanceData,	/* The pipe state. */
     int direction,		/* TCL_READABLE or TCL_WRITABLE */
-    void **handlePtr)		/* Where to store the handle.  */
+    void **handlePtr)	/* Where to store the handle.  */
 {
     PipeInfo *infoPtr = (PipeInfo *) instanceData;
     WinFile *filePtr;
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index d426e7d..8ab4548 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -512,12 +512,12 @@ typedef DWORD_PTR * PDWORD_PTR;
  * use by tclAlloc.c.
  */
 
-#define TclpSysAlloc(size) \
-	((void*)HeapAlloc(GetProcessHeap(), 0, size))
-#define TclpSysFree(ptr) \
-	(HeapFree(GetProcessHeap(), 0, (HGLOBAL)ptr))
-#define TclpSysRealloc(ptr, size) \
-	((void*)HeapReAlloc(GetProcessHeap(), 0, (LPVOID)ptr, size))
+#define TclpSysAlloc(size)		((void*)HeapAlloc(GetProcessHeap(), \
+					    0, size))
+#define TclpSysFree(ptr)		(HeapFree(GetProcessHeap(), \
+					    0, (HGLOBAL)ptr))
+#define TclpSysRealloc(ptr, size)	((void*)HeapReAlloc(GetProcessHeap(), \
+					    0, (LPVOID)ptr, size))
 
 /* This type is not defined in the Windows headers */
 #define socklen_t       int
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index fc495ed..68e22cb 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -88,10 +88,8 @@ static DWORD lastType = REG_RESOURCE_LIST;
 
 #if (TCL_MAJOR_VERSION < 9) && defined(TCL_MINOR_VERSION) && (TCL_MINOR_VERSION < 7)
 # if TCL_UTF_MAX > 3
-#   define Tcl_WCharToUtfDString(a, b, c) \
-	Tcl_WinTCharToUtf((TCHAR *)(a), (b) * sizeof(WCHAR), c)
-#   define Tcl_UtfToWCharDString(a, b, c) \
-	(WCHAR *)Tcl_WinUtfToTChar(a, b, c)
+#   define Tcl_WCharToUtfDString(a,b,c) Tcl_WinTCharToUtf((TCHAR *)(a),(b)*sizeof(WCHAR),c)
+#   define Tcl_UtfToWCharDString(a,b,c) (WCHAR *)Tcl_WinUtfToTChar(a,b,c)
 # else
 #   define Tcl_WCharToUtfDString Tcl_UniCharToUtfDString
 #   define Tcl_UtfToWCharDString Tcl_UtfToUniCharDString
@@ -295,9 +293,9 @@ DeleteCmd(
 
 static int
 RegistryObjCmd(
-    void *dummy,		/* Not used. */
+    void *dummy,	/* Not used. */
     Tcl_Interp *interp,		/* Current interpreter. */
-    Tcl_Size objc,		/* Number of arguments. */
+    Tcl_Size objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument values. */
 {
     Tcl_Size n = 1, argc;
@@ -937,7 +935,7 @@ GetValueNames(
      */
 
     size = MAX_KEY_LENGTH;
-    while (RegEnumValueW(key, index, (WCHAR *)Tcl_DStringValue(&buffer),
+    while (RegEnumValueW(key,index, (WCHAR *)Tcl_DStringValue(&buffer),
 	    &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) {
 	Tcl_DStringInit(&ds);
 	Tcl_WCharToUtfDString((const WCHAR *)Tcl_DStringValue(&buffer), size, &ds);
@@ -1431,7 +1429,7 @@ SetValue(
 static int
 BroadcastValue(
     Tcl_Interp *interp,		/* Current interpreter. */
-    Tcl_Size objc,		/* Number of arguments. */
+    Tcl_Size objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument values. */
 {
     LRESULT result;
diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c
index 66a1540..e27937e 100644
--- a/win/tclWinSerial.c
+++ b/win/tclWinSerial.c
@@ -204,7 +204,7 @@ static int		SerialBlockingWrite(SerialInfo *infoPtr, LPVOID buf,
 static const Tcl_ChannelType serialChannelType = {
     "serial",			/* Type name. */
     TCL_CHANNEL_VERSION_5,	/* v5 channel */
-    NULL,			/* Close proc. */
+    NULL,		/* Close proc. */
     SerialInputProc,		/* Input proc. */
     SerialOutputProc,		/* Output proc. */
     NULL,			/* Seek proc. */
@@ -218,7 +218,7 @@ static const Tcl_ChannelType serialChannelType = {
     NULL,			/* handler proc. */
     NULL,			/* wide seek proc */
     SerialThreadActionProc,	/* thread action proc */
-    NULL			/* truncate */
+    NULL                       /* truncate */
 };
 
 /*
@@ -854,7 +854,7 @@ SerialBlockingWrite(
 
 static int
 SerialInputProc(
-    void *instanceData,		/* Serial state. */
+    void *instanceData,	/* Serial state. */
     char *buf,			/* Where to store data read. */
     int bufSize,		/* How much space is available in the
 				 * buffer? */
@@ -961,7 +961,7 @@ SerialInputProc(
 
 static int
 SerialOutputProc(
-    void *instanceData,		/* Serial state. */
+    void *instanceData,	/* Serial state. */
     const char *buf,		/* The data buffer. */
     int toWrite,		/* How many bytes to write? */
     int *errorCode)		/* Where to store error code. */
@@ -1191,7 +1191,7 @@ SerialEventProc(
 
 static void
 SerialWatchProc(
-    void *instanceData,		/* Serial state. */
+    void *instanceData,	/* Serial state. */
     int mask)			/* What events to watch for, OR-ed combination
 				 * of TCL_READABLE, TCL_WRITABLE and
 				 * TCL_EXCEPTION. */
@@ -1248,9 +1248,9 @@ SerialWatchProc(
 
 static int
 SerialGetHandleProc(
-    void *instanceData,		/* The serial state. */
+    void *instanceData,	/* The serial state. */
     TCL_UNUSED(int) /*direction*/,
-    void **handlePtr)		/* Where to store the handle. */
+    void **handlePtr)	/* Where to store the handle. */
 {
     SerialInfo *infoPtr = (SerialInfo *) instanceData;
 
@@ -1610,7 +1610,7 @@ SerialModemStatusStr(
 
 static int
 SerialSetOptionProc(
-    void *instanceData,		/* File state. */
+    void *instanceData,	/* File state. */
     Tcl_Interp *interp,		/* For error reporting - can be NULL. */
     const char *optionName,	/* Which option to set? */
     const char *value)		/* New value for option. */
@@ -2034,7 +2034,7 @@ SerialSetOptionProc(
 
 static int
 SerialGetOptionProc(
-    void *instanceData,		/* File state. */
+    void *instanceData,	/* File state. */
     Tcl_Interp *interp,		/* For error reporting - can be NULL. */
     const char *optionName,	/* Option to get. */
     Tcl_DString *dsPtr)		/* Where to store value(s). */
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index c11413c..49f445d 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -1289,7 +1289,7 @@ TcpGetOptionProc(
     int reverseDNS = 0;
 #define SUPPRESS_RDNS_VAR "::tcl::unsupported::noReverseDNS"
 #define HAVE_OPTION(option) \
-	((len > 1) && (optionName[1] == option[1]) &&			\
+	((len > 1) && (optionName[1] == option[1]) && \
 	    (strncmp(optionName, option, len) == 0))
 
     /*
@@ -2655,7 +2655,7 @@ SocketEventProc(
 	     */
 
 	    SetEvent(tsdPtr->socketListLock);
-	    WaitForConnect(statePtr, NULL);
+	    WaitForConnect(statePtr,NULL);
 	} else {
 	    /*
 	     * No async connect reenter pending. Just clear event.
diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c
index dee606b..d5c582b 100644
--- a/win/tclWinThrd.c
+++ b/win/tclWinThrd.c
@@ -218,8 +218,8 @@ TclpThreadCreate(
 
     EnterCriticalSection(&joinLock);
 
-    *idPtr = 0;		/* must initialize as Tcl_Thread is a pointer and
-			 * on WIN64 sizeof void* != sizeof unsigned */
+    *idPtr = 0; /* must initialize as Tcl_Thread is a pointer and
+                 * on WIN64 sizeof void* != sizeof unsigned */
 
 #if defined(_MSC_VER) || defined(__MSVCRT__)
     tHandle = (HANDLE) _beginthreadex(NULL, (unsigned)stackSize,