diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-05-17 19:05:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-05-17 19:05:37 (GMT) |
| commit | 37c4a581adba19a71bdc30897e11a4be2d24b2ce (patch) | |
| tree | 9e1c46e9cd0b8c0e41b8d692d4527228a718e7c0 /generic/tclEvent.c | |
| parent | cfd3e7533755f50f92a64c9a5b637b52f30ae3ee (diff) | |
| parent | 4f1ea4779be85d8837f3a133b52d3b5aa9e53fda (diff) | |
| download | tcl-37c4a581adba19a71bdc30897e11a4be2d24b2ce.zip tcl-37c4a581adba19a71bdc30897e11a4be2d24b2ce.tar.gz tcl-37c4a581adba19a71bdc30897e11a4be2d24b2ce.tar.bz2 | |
Merge 8.7, but keep TCL_THREADS undefined in tcl.h (since that's no longer necessary)
Diffstat (limited to 'generic/tclEvent.c')
| -rw-r--r-- | generic/tclEvent.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tclEvent.c b/generic/tclEvent.c index 93cf983..f8ad1ae 100644 --- a/generic/tclEvent.c +++ b/generic/tclEvent.c @@ -100,7 +100,7 @@ typedef struct ThreadSpecificData { } ThreadSpecificData; static Tcl_ThreadDataKey dataKey; -#ifdef TCL_THREADS +#if !defined(TCL_THREADS) || TCL_THREADS typedef struct { Tcl_ThreadCreateProc *proc; /* Main() function of the thread */ ClientData clientData; /* The one argument to Main() */ @@ -1043,7 +1043,7 @@ TclInitSubsystems(void) #if USE_TCLALLOC TclInitAlloc(); /* Process wide mutex init */ #endif -#if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC) +#if (!defined(TCL_THREADS) || TCL_THREADS) && defined(USE_THREAD_ALLOC) TclInitThreadAlloc(); /* Setup thread allocator caches */ #endif #ifdef TCL_MEM_DEBUG @@ -1220,7 +1220,7 @@ Tcl_Finalize(void) * Close down the thread-specific object allocator. */ -#if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC) +#if (!defined(TCL_THREADS) || TCL_THREADS) && defined(USE_THREAD_ALLOC) TclFinalizeThreadAlloc(); #endif @@ -1538,7 +1538,7 @@ Tcl_UpdateObjCmd( return TCL_OK; } -#ifdef TCL_THREADS +#if !defined(TCL_THREADS) || TCL_THREADS /* *---------------------------------------------------------------------- * @@ -1601,7 +1601,7 @@ Tcl_CreateThread( int flags) /* Flags controlling behaviour of the new * thread. */ { -#ifdef TCL_THREADS +#if !defined(TCL_THREADS) || TCL_THREADS ThreadClientData *cdPtr = ckalloc(sizeof(ThreadClientData)); int result; |