merge trunk

1 files changed, 0 insertions, 39 deletions

diff --git a/generic/tclThread.c b/generic/tclThread.c
index 7882a48..198fa6a 100644
--- a/generic/tclThread.c
+++ b/generic/tclThread.c
@@ -284,45 +284,6 @@ Tcl_MutexFinalize(
 /*
  *----------------------------------------------------------------------
  *
- * TclMutexUnlockAndFinalize --
- *
- *	This procedure is invoked to unlock and then finalize a mutex.
- *	The mutex must have been locked by Tcl_MutexLock.  It is also
- *	removed from the list of remembered objects.  The mutex can no
- *	longer be used after calling this procedure.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Remove the mutex from the list.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclMutexUnlockAndFinalize(
-    Tcl_Mutex *mutexPtr)
-{
-#ifdef TCL_THREADS
-    Tcl_Mutex mutex;
-#endif
-    TclpMasterLock();
-    TclpMutexLock();
-#ifdef TCL_THREADS
-    mutex = *mutexPtr;
-    *mutexPtr = NULL; /* Force it to be created again. */
-    Tcl_MutexUnlock(&mutex);
-    TclpFinalizeMutex(&mutex);
-#endif
-    ForgetSyncObject(mutexPtr, &mutexRecord);
-    TclpMutexUnlock();
-    TclpMasterUnlock();
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * TclRememberCondition
  *
  *	Keep a list of condition variables used during finalization.