summaryrefslogtreecommitdiffstats
path: root/generic/tclInt.h
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2013-01-04 11:14:59 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2013-01-04 11:14:59 (GMT)
commit8ccae052467b3b4ef6a42321289d1a8535c858d5 (patch)
treea2ed642c38ff21ba7fd8a3a8b25f0407daa58114 /generic/tclInt.h
parentaa5bfc6d5bbe02732c290215d4f69c1f1ce37dda (diff)
parent09d1473b3be04898d6ec67abcad0b980fdd88df6 (diff)
downloadtcl-8ccae052467b3b4ef6a42321289d1a8535c858d5.zip
tcl-8ccae052467b3b4ef6a42321289d1a8535c858d5.tar.gz
tcl-8ccae052467b3b4ef6a42321289d1a8535c858d5.tar.bz2
merge trunk
Diffstat (limited to 'generic/tclInt.h')
-rw-r--r--generic/tclInt.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h
index f308a67..537afb3 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -4050,6 +4050,7 @@ typedef const char *TclDTraceStr;
ckfree((char *) (objPtr))
#undef USE_THREAD_ALLOC
+#undef USE_TCLALLOC
#elif defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
/*