summaryrefslogtreecommitdiffstats
path: root/generic
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 /generic
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 'generic')
-rw-r--r--generic/tclAlloc.c4
-rwxr-xr-xgeneric/tclThreadAlloc.c4
2 files changed, 4 insertions, 4 deletions
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"