aboutsummaryrefslogtreecommitdiffstats
path: root/src/gmalloc.c
diff options
context:
space:
mode:
authorGerd Moellmann2000-10-20 15:57:00 +0000
committerGerd Moellmann2000-10-20 15:57:00 +0000
commit8094989ba2229aeb562284ac96034252ad0c90c8 (patch)
tree80683494a60436459243ed8fa593f73e5e61182b /src/gmalloc.c
parent877935b1f574db32339050788147d677fc3cce27 (diff)
downloademacs-8094989ba2229aeb562284ac96034252ad0c90c8.tar.gz
emacs-8094989ba2229aeb562284ac96034252ad0c90c8.zip
(_malloc_internal) [GC_MALLOC_CHECK]: Use
_malloc_internal instead of malloc. (_free_internal) [GC_MALLOC_CHECK]: Use _free_internal instead of free.
Diffstat (limited to 'src/gmalloc.c')
-rw-r--r--src/gmalloc.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c
index e05b758b766..2ce168c71c8 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -678,7 +678,11 @@ _malloc_internal (size)
678 { 678 {
679 /* No free fragments of the desired size, so get a new block 679 /* No free fragments of the desired size, so get a new block
680 and break it into fragments, returning the first. */ 680 and break it into fragments, returning the first. */
681#ifdef GC_MALLOC_CHECK
682 result = _malloc_internal (BLOCKSIZE);
683#else
681 result = malloc (BLOCKSIZE); 684 result = malloc (BLOCKSIZE);
685#endif
682 if (result == NULL) 686 if (result == NULL)
683 return NULL; 687 return NULL;
684 688
@@ -1092,7 +1096,11 @@ _free_internal (ptr)
1092 _chunks_free -= BLOCKSIZE >> type; 1096 _chunks_free -= BLOCKSIZE >> type;
1093 _bytes_free -= BLOCKSIZE; 1097 _bytes_free -= BLOCKSIZE;
1094 1098
1099#ifdef GC_MALLOC_CHECK
1100 _free_internal (ADDRESS (block));
1101#else
1095 free (ADDRESS (block)); 1102 free (ADDRESS (block));
1103#endif
1096 } 1104 }
1097 else if (_heapinfo[block].busy.info.frag.nfree != 0) 1105 else if (_heapinfo[block].busy.info.frag.nfree != 0)
1098 { 1106 {