summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2004-05-04 20:09:33 (GMT)
committerdgp <dgp@users.sourceforge.net>2004-05-04 20:09:33 (GMT)
commit2742ad43c8f87f43b1ede78734ded19ce09c89b5 (patch)
tree31e9cb75db07943c35a5ae6787584abadda8218d /generic
parent9f072ac4043a1c048fb8ccb62c214508080ad25e (diff)
downloadtcl-2742ad43c8f87f43b1ede78734ded19ce09c89b5.zip
tcl-2742ad43c8f87f43b1ede78734ded19ce09c89b5.tar.gz
tcl-2742ad43c8f87f43b1ede78734ded19ce09c89b5.tar.bz2
* generic/tclAlloc.c: Make sure Tclp*Alloc* routines get
* generic/tclInt.h: declared in the TCL_MEM_DEBUG and * generic/tclThreadAlloc.c: TCL_THREADS configuration. [Bug 947564]
Diffstat (limited to 'generic')
-rw-r--r--generic/tclAlloc.c5
-rw-r--r--generic/tclInt.h4
-rwxr-xr-xgeneric/tclThreadAlloc.c5
3 files changed, 7 insertions, 7 deletions
diff --git a/generic/tclAlloc.c b/generic/tclAlloc.c
index aeb0cc8..f51b039 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.19 2004/04/06 22:25:48 dgp Exp $
+ * RCS: @(#) $Id: tclAlloc.c,v 1.20 2004/05/04 20:09:33 dgp Exp $
*/
/*
@@ -23,9 +23,8 @@
* that has significantly reduced lock contention.
*/
-#if !defined(TCL_THREADS) || !defined(USE_THREAD_ALLOC)
-
#include "tclInt.h"
+#if !defined(TCL_THREADS) || !defined(USE_THREAD_ALLOC)
#if USE_TCLALLOC
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 9729ec7..361a7ea 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclInt.h,v 1.156 2004/05/03 19:59:18 msofer Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.157 2004/05/04 20:09:33 dgp Exp $
*/
#ifndef _TCLINT
@@ -2169,6 +2169,8 @@ EXTERN void TclDbInitNewObj _ANSI_ARGS_((Tcl_Obj *objPtr));
# define TclNewListObjDirect(objc, objv) \
TclDbNewListObjDirect(objc, objv, __FILE__, __LINE__)
+#undef USE_THREAD_ALLOC
+
#elif defined(PURIFY)
/*
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index 70a7980..d18bf3a 100755
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -11,12 +11,11 @@
* 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.11 2004/04/30 20:06:44 dgp Exp $
+ * RCS: @(#) $Id: tclThreadAlloc.c,v 1.12 2004/05/04 20:09:33 dgp Exp $
*/
-#if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
-
#include "tclInt.h"
+#if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
/*
* If range checking is enabled, an additional byte will be allocated