diff options
| author | Joe Mistachkin <joe@mistachkin.com> | 2015-10-21 20:18:58 (GMT) |
|---|---|---|
| committer | Joe Mistachkin <joe@mistachkin.com> | 2015-10-21 20:18:58 (GMT) |
| commit | 09ea45da659a9f307db9b53c6f15886435f5af81 (patch) | |
| tree | b59bcc933e315941931517b6417b9e4457ede63b /generic | |
| parent | 55eaa262af18233fe7993814273589f53aa273c2 (diff) | |
| download | tcl-bug_57945b574a.zip tcl-bug_57945b574a.tar.gz tcl-bug_57945b574a.tar.bz2 | |
Further cleanup and enhancements.bug_57945b574a
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tcl.h | 2 | ||||
| -rw-r--r-- | generic/tclInt.h | 2 | ||||
| -rw-r--r-- | generic/tclThread.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 0fddc99..b989b4e 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -746,7 +746,7 @@ typedef void (Tcl_EventCheckProc) (ClientData clientData, int flags); typedef int (Tcl_EventDeleteProc) (Tcl_Event *evPtr, ClientData clientData); typedef void (Tcl_EventSetupProc) (ClientData clientData, int flags); typedef void (Tcl_ExitProc) (ClientData clientData); -typedef void (Tcl_MutexWaitProc) (Tcl_Mutex *mutexPtr, int retry, +typedef void (Tcl_MutexWaitProc) (Tcl_Mutex *mutexPtr, int *retry, ClientData clientData); typedef void (Tcl_FileProc) (ClientData clientData, int mask); typedef void (Tcl_FileFreeProc) (ClientData clientData); diff --git a/generic/tclInt.h b/generic/tclInt.h index b11ef05..2a65d4b 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -3062,6 +3062,8 @@ MODULE_SCOPE void TclpMasterLock(void); MODULE_SCOPE void TclpMasterUnlock(void); MODULE_SCOPE void TclpMutexLock(void); MODULE_SCOPE void TclpMutexUnlock(void); +MODULE_SCOPE void TclpMutexWait(Tcl_Mutex *mutexPtr, int *retry, + ClientData clientData); 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 c621182..83d969f 100644 --- a/generic/tclThread.c +++ b/generic/tclThread.c @@ -51,7 +51,7 @@ static void RememberSyncObject(void *objPtr, * This is a mutex wait procedure that does nothing. */ -static void MutexWaitNone(Tcl_Mutex *mutexPtr, int retry, +static void MutexWaitNone(Tcl_Mutex *mutexPtr, int *retry, ClientData clientData); /* @@ -479,7 +479,7 @@ Tcl_MutexWaitProc *TclGetMutexWaitProc(void) static void MutexWaitNone( Tcl_Mutex *mutexPtr, /* Mutex passed to Tcl_MutexLock. */ - int retry, /* The number of retries so far. */ + int *retry, /* The number of retries so far. */ ClientData clientData) /* The extra data, if any. */ { /* Do nothing. */ |