summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclInt.h7
-rw-r--r--unix/Makefile.in5
3 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 69760dc..5e143a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-07 Miguel Sofer <msofer@users.sf.net>
+
+ * generic/tclInt.h: fix USE_TCLALLOC so that it can be enabled
+ * unix/Makefile.in: without editing the Makefile
+
2011-05-05 Don Porter <dgp@users.sourceforge.net>
* generic/tclListObj.c: Stop generating string rep of dict when
diff --git a/generic/tclInt.h b/generic/tclInt.h
index e3aaccb..fdcd4e9 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3940,6 +3940,13 @@ MODULE_SCOPE void TclpFreeAllocCache(void *);
#else /* not PURIFY or USE_THREAD_ALLOC */
+#if defined(USE_TCLALLOC) && USE_TCLALLOC
+ MODULE_SCOPE void TclFinalizeAllocSubsystem();
+ MODULE_SCOPE void TclInitAlloc();
+#else
+# define USE_TCLALLOC 0
+#endif
+
#ifdef TCL_THREADS
/* declared in tclObj.c */
MODULE_SCOPE Tcl_Mutex tclObjMutex;
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 20ba896..f00746d 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1007,11 +1007,8 @@ regerror.o: $(REGHDRS) $(GENERIC_DIR)/regerrs.h $(GENERIC_DIR)/regerror.c
tclAppInit.o: $(UNIX_DIR)/tclAppInit.c
$(CC) -c $(APP_CC_SWITCHES) $(UNIX_DIR)/tclAppInit.c
-# On Unix we want to use the normal malloc/free implementation, so we
-# specifically set the USE_TCLALLOC flag.
-
tclAlloc.o: $(GENERIC_DIR)/tclAlloc.c
- $(CC) -c $(CC_SWITCHES) -DUSE_TCLALLOC=0 $(GENERIC_DIR)/tclAlloc.c
+ $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclAlloc.c
tclAssembly.o: $(GENERIC_DIR)/tclAssembly.c $(COMPILEHDR)
$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclAssembly.c