diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-09-24 11:06:44 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-09-24 11:06:44 (GMT) |
commit | f9465250b939d54021e85ba03eaf63f31b4b3037 (patch) | |
tree | 2ae41f24c9d29f6ca8124e305514a4dc07a62ace /generic | |
parent | d13f877148291986699ef0c0cfb2246bc8c44faa (diff) | |
parent | 2101ef45be45e0aa88d3e8c9725df9ca92309fe9 (diff) | |
download | tcl-f9465250b939d54021e85ba03eaf63f31b4b3037.zip tcl-f9465250b939d54021e85ba03eaf63f31b4b3037.tar.gz tcl-f9465250b939d54021e85ba03eaf63f31b4b3037.tar.bz2 |
Fix [5d170b5ca5e12743006d737c79f959f3efabc644|5d170b5ca5]: checkin 9f8b7bea5344f1b0 broke netbsd's thread notifier
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tclInt.h | 3 | ||||
-rw-r--r-- | generic/tclThread.c | 39 |
2 files changed, 0 insertions, 42 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h index 54ecc0b..356d250 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -3059,9 +3059,6 @@ MODULE_SCOPE void TclpInitUnlock(void); MODULE_SCOPE Tcl_Obj * TclpObjListVolumes(void); MODULE_SCOPE void TclpMasterLock(void); MODULE_SCOPE void TclpMasterUnlock(void); -MODULE_SCOPE void TclpMutexLock(void); -MODULE_SCOPE void TclpMutexUnlock(void); -MODULE_SCOPE void TclMutexUnlockAndFinalize(Tcl_Mutex *mutex); MODULE_SCOPE int TclpMatchFiles(Tcl_Interp *interp, char *separators, Tcl_DString *dirPtr, char *pattern, char *tail); MODULE_SCOPE int TclpObjNormalizePath(Tcl_Interp *interp, 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. |