diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | generic/tclAlloc.c | 4 | ||||
| -rwxr-xr-x | generic/tclThreadAlloc.c | 4 | ||||
| -rw-r--r-- | unix/tclUnixThrd.c | 2 | ||||
| -rw-r--r-- | win/tclWinThrd.c | 7 |
5 files changed, 17 insertions, 8 deletions
@@ -1,3 +1,11 @@ +2004-10-28 Andreas Kupries <andreask@activestate.com> + + * generic/tclAlloc.c: Fixed [Tcl SF Bug 1030548], a + * generic/tclThreadAlloc.c: threaded debug build on Windows + * win/tclWinThrd.c: now works again. Had to touch Unix + * unix/tclUnixThrd.c: as well. Basic patch by Kevin, with + modifications by myself. + 2004-10-28 Don Porter <dgp@users.sourceforge.net> * README: Bumped patch level to 8.4.8 to prepare diff --git a/generic/tclAlloc.c b/generic/tclAlloc.c index fe64c97..e51ba8e 100644 --- a/generic/tclAlloc.c +++ b/generic/tclAlloc.c @@ -15,7 +15,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclAlloc.c,v 1.16 2002/04/23 17:03:34 hobbs Exp $ + * RCS: @(#) $Id: tclAlloc.c,v 1.16.2.1 2004/10/28 21:12:37 andreas_kupries Exp $ */ /* @@ -23,7 +23,7 @@ * that has significantly reduced lock contention. */ -#if !defined(TCL_THREADS) || !defined(USE_THREAD_ALLOC) +#if !defined(TCL_THREADS) || !defined(USE_THREAD_ALLOC) || defined(TCL_MEM_DEBUG) #include "tclInt.h" #include "tclPort.h" diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c index d14ed87..fdddeff 100755 --- a/generic/tclThreadAlloc.c +++ b/generic/tclThreadAlloc.c @@ -11,12 +11,12 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclThreadAlloc.c,v 1.4.2.4 2004/07/25 21:38:09 patthoyts Exp $ + * RCS: @(#) $Id: tclThreadAlloc.c,v 1.4.2.5 2004/10/28 21:12:38 andreas_kupries Exp $ */ #include "tclInt.h" -#if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC) +#if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC) && !defined(TCL_MEM_DEBUG) #ifdef WIN32 #include "tclWinInt.h" diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c index 738808a..00059df 100644 --- a/unix/tclUnixThrd.c +++ b/unix/tclUnixThrd.c @@ -883,7 +883,7 @@ TclpInetNtoa(struct in_addr addr) #endif } -#ifdef TCL_THREADS +#if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC) && !defined(TCL_MEM_DEBUG) /* * Additions by AOL for specialized thread memory allocator. */ diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c index c99f27b..05a321b 100644 --- a/win/tclWinThrd.c +++ b/win/tclWinThrd.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinThrd.c,v 1.24.2.8 2004/07/21 01:30:58 hobbs Exp $ + * RCS: @(#) $Id: tclWinThrd.c,v 1.24.2.9 2004/10/28 21:12:38 andreas_kupries Exp $ */ #include "tclWinInt.h" @@ -680,7 +680,7 @@ TclpFinalizeThreadData(keyPtr) DWORD *indexPtr; BOOL success; -#ifdef USE_THREAD_ALLOC +#if defined(USE_THREAD_ALLOC) && !defined(TCL_MEM_DEBUG) TclWinFreeAllocCache(); #endif if (*keyPtr != NULL) { @@ -1037,7 +1037,8 @@ TclpFinalizeCondition(condPtr) /* * Additions by AOL for specialized thread memory allocator. */ -#ifdef USE_THREAD_ALLOC + +#if defined(USE_THREAD_ALLOC) && !defined(TCL_MEM_DEBUG) static int once; static DWORD key; |