summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authormig <mig>2011-03-21 14:42:36 (GMT)
committermig <mig>2011-03-21 14:42:36 (GMT)
commita5177ffb5dd447e70609635c7472f0eeb7f88fde (patch)
tree6f673c749a965f87bd3edcab20ddaebdd2f706f2 /generic
parentaabe179206fe559570c3e4cd5bc1741b197555b9 (diff)
parentb3db9be3e756f6c6e6267a5691d47d6c5d5acf6d (diff)
downloadtcl-a5177ffb5dd447e70609635c7472f0eeb7f88fde.zip
tcl-a5177ffb5dd447e70609635c7472f0eeb7f88fde.tar.gz
tcl-a5177ffb5dd447e70609635c7472f0eeb7f88fde.tar.bz2
remove one level of allocator indirection in non-memdebug builds, imported from mig-alloc-reform.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclCkalloc.c12
-rw-r--r--generic/tclInt.h6
2 files changed, 12 insertions, 6 deletions
diff --git a/generic/tclCkalloc.c b/generic/tclCkalloc.c
index 9d63ebf..056841d 100644
--- a/generic/tclCkalloc.c
+++ b/generic/tclCkalloc.c
@@ -20,6 +20,12 @@
#define FALSE 0
#define TRUE 1
+#undef Tcl_Alloc
+#undef Tcl_Free
+#undef Tcl_Realloc
+#undef Tcl_AttemptAlloc
+#undef Tcl_AttemptRealloc
+
#ifdef TCL_MEM_DEBUG
/*
@@ -736,12 +742,6 @@ Tcl_AttemptDbCkrealloc(
*----------------------------------------------------------------------
*/
-#undef Tcl_Alloc
-#undef Tcl_Free
-#undef Tcl_Realloc
-#undef Tcl_AttemptAlloc
-#undef Tcl_AttemptRealloc
-
char *
Tcl_Alloc(
unsigned int size)
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 42e2212..53e4323 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -4628,6 +4628,12 @@ typedef struct NRE_callback {
#include "tclIntPlatDecls.h"
#include "tclTomMathDecls.h"
+#if !defined(USE_TCL_STUBS) && !defined(TCL_MEM_DEBUG)
+#define Tcl_AttemptAlloc(size) TclpAlloc(size)
+#define Tcl_AttemptRealloc(ptr, size) TclpRealloc((ptr), (size))
+#define Tcl_Free(ptr) TclpFree(ptr)
+#endif
+
#endif /* _TCLINT */
/*