Merge 8.6. Fix TCL_NO_DEPRECATED build

4 files changed, 9 insertions, 7 deletions

diff --git a/generic/tclIO.c b/generic/tclIO.c
index 6ab1289..fe5472e 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -3065,7 +3065,7 @@ FreeChannelState(
 	ReleaseChannelBuffer(statePtr->curOutPtr);
     }
     DiscardOutputQueued(statePtr);
-    
+
     DeleteTimerHandler(statePtr);
 
     if (statePtr->chanMsg) {
diff --git a/generic/tclIORChan.c b/generic/tclIORChan.c
index 0f683b4..36f7a92 100644
--- a/generic/tclIORChan.c
+++ b/generic/tclIORChan.c
@@ -2348,11 +2348,11 @@ CleanRefChannelInstance(
     ReflectedChannel *rcPtr)
 {
     if (rcPtr->name) {
-	/* 
+	/*
 	 * Reset obj-type (channel is deleted or dead anyway) to avoid leakage
 	 * by cyclic references (see bug [79474c58800cdf94]).
 	 */
-	TclFreeIntRep(rcPtr->name);
+	TclFreeInternalRep(rcPtr->name);
 	Tcl_DecrRefCount(rcPtr->name);
 	rcPtr->name = NULL;
     }
diff --git a/tests/oo.test b/tests/oo.test
index 910b2b0..f3413e1 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -3456,7 +3456,7 @@ oo::class create WorkerSupport {
 	    return [uplevel 1 $script]
 	} finally {
 	    foreach worker $workers {$worker destroy}
-	} 
+	}
     }
     method run {nworkers} {
 	set result {}
diff --git a/unix/tclUnixPipe.c b/unix/tclUnixPipe.c
index 70a5d5d..32fc631 100644
--- a/unix/tclUnixPipe.c
+++ b/unix/tclUnixPipe.c
@@ -620,7 +620,7 @@ TclpCreateProcess(
     }
 
     TclpCloseFile(errPipeIn);
-    *pidPtr = (Tcl_Pid) INT2PTR(pid);
+    *pidPtr = (Tcl_Pid)INT2PTR(pid);
     return TCL_OK;
 
   error:
@@ -1220,12 +1220,14 @@ PipeOutputProc(
  * so do not pass it to directly to Tcl_CreateFileHandler.
  * Instead, pass a wrapper which is a Tcl_FileProc.
  */
+
 static void
 PipeWatchNotifyChannelWrapper(
     void *clientData,
     int mask)
 {
     Tcl_Channel channel = (Tcl_Channel)clientData;
+
     Tcl_NotifyChannel(channel, mask);
 }
 
@@ -1324,7 +1326,7 @@ Tcl_WaitPid(
     while (1) {
 	result = (int) waitpid(real_pid, statPtr, options);
 	if ((result != -1) || (errno != EINTR)) {
-	    return (Tcl_Pid) INT2PTR(result);
+	    return (Tcl_Pid)INT2PTR(result);
 	}
     }
 }
@@ -1370,7 +1372,7 @@ Tcl_PidObjCmd(
 	 * Get the channel and make sure that it refers to a pipe.
 	 */
 
-	chan = Tcl_GetChannel(interp, Tcl_GetString(objv[1]), NULL);
+	chan = Tcl_GetChannel(interp, TclGetString(objv[1]), NULL);
 	if (chan == NULL) {
 	    return TCL_ERROR;
 	}