summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2004-10-28 21:12:33 (GMT)
committerandreas_kupries <akupries@shaw.ca>2004-10-28 21:12:33 (GMT)
commit0c45f847cdb07da65270f480ccf96da7464448e9 (patch)
tree3d9bf2760c3cffdf34ac6a2a610549f83ba708e3 /win
parent93db5dfcdf5fedb0552a7a20e13e9643ecbf564f (diff)
downloadtcl-0c45f847cdb07da65270f480ccf96da7464448e9.zip
tcl-0c45f847cdb07da65270f480ccf96da7464448e9.tar.gz
tcl-0c45f847cdb07da65270f480ccf96da7464448e9.tar.bz2
* 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.
Diffstat (limited to 'win')
-rw-r--r--win/tclWinThrd.c7
1 files changed, 4 insertions, 3 deletions
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;