diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-05-23 19:31:59 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-05-23 19:31:59 (GMT) |
| commit | a9e7c22c38a58f2248f2bd51529411914cd16e06 (patch) | |
| tree | 7c81647cd6c83cb8b6a4fa65351908dc53c7c33b /generic | |
| parent | 94314d340912c11bcd33a9631f14e3f1d20607ff (diff) | |
| parent | edb38932e8f071b1326515067d41bc060807dec2 (diff) | |
| download | tcl-a9e7c22c38a58f2248f2bd51529411914cd16e06.zip tcl-a9e7c22c38a58f2248f2bd51529411914cd16e06.tar.gz tcl-a9e7c22c38a58f2248f2bd51529411914cd16e06.tar.bz2 | |
merge 8.7
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclInt.h | 23 | ||||
| -rw-r--r-- | generic/tclThread.c | 4 |
2 files changed, 22 insertions, 5 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h index 7f9b0fc..b7daf90 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -124,6 +124,26 @@ typedef int ptrdiff_t; # define vsnprintf _vsnprintf #endif +#if !defined(TCL_THREADS) +# define TCL_THREADS 1 +#endif +#if !TCL_THREADS +# undef TCL_DECLARE_MUTEX +# define TCL_DECLARE_MUTEX(name) +# undef Tcl_MutexLock +# define Tcl_MutexLock(mutexPtr) +# undef Tcl_MutexUnlock +# define Tcl_MutexUnlock(mutexPtr) +# undef Tcl_MutexFinalize +# define Tcl_MutexFinalize(mutexPtr) +# undef Tcl_ConditionNotify +# define Tcl_ConditionNotify(condPtr) +# undef Tcl_ConditionWait +# define Tcl_ConditionWait(condPtr, mutexPtr, timePtr) +# undef Tcl_ConditionFinalize +# define Tcl_ConditionFinalize(condPtr) +#endif + /* * The following procedures allow namespaces to be customized to support * special name resolution rules for commands/variables. @@ -4131,9 +4151,6 @@ typedef const char *TclDTraceStr; } \ } -#if !defined(TCL_THREADS) -# define TCL_THREADS 1 -#endif #if TCL_THREADS && !defined(USE_THREAD_ALLOC) # define USE_THREAD_ALLOC 1 #endif diff --git a/generic/tclThread.c b/generic/tclThread.c index 8def429..cafd824 100644 --- a/generic/tclThread.c +++ b/generic/tclThread.c @@ -254,6 +254,7 @@ TclRememberMutex( *---------------------------------------------------------------------- */ +#undef Tcl_MutexFinalize void Tcl_MutexFinalize( Tcl_Mutex *mutexPtr) @@ -307,6 +308,7 @@ TclRememberCondition( *---------------------------------------------------------------------- */ +#undef Tcl_ConditionFinalize void Tcl_ConditionFinalize( Tcl_Condition *condPtr) @@ -458,9 +460,7 @@ Tcl_ExitThread( int status) { Tcl_FinalizeThread(); -#if TCL_THREADS TclpThreadExit(status); -#endif } #if !TCL_THREADS |