Mercurial > emacs
changeset 31892:2f3d88ac2b38
(__malloc_size_t) [DOUG_LEA_MALLOC]: Don't redefine it.
(__malloc_size_t) [!DOUG_LEA_MALLOC]: Define unconditionally as
size_t.
(__malloc_extra_blocks): Declare as __malloc_size_t.
| author | Dave Love <fx@gnu.org> |
|---|---|
| date | Mon, 25 Sep 2000 21:08:56 +0000 |
| parents | d8d68cbd1113 |
| children | 5699c4d70f3c |
| files | src/alloc.c |
| diffstat | 1 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/alloc.c Mon Sep 25 21:07:55 2000 +0000 +++ b/src/alloc.c Mon Sep 25 21:08:56 2000 +0000 @@ -52,7 +52,10 @@ #ifdef DOUG_LEA_MALLOC #include <malloc.h> +/* malloc.h #defines this as size_t, at least in glibc2. */ +#ifndef __malloc_size_t #define __malloc_size_t int +#endif /* Specify maximum number of areas to mmap. It would be nice to use a value that explicitly means "no limit". */ @@ -63,14 +66,9 @@ /* The following come from gmalloc.c. */ -#if defined (STDC_HEADERS) -#include <stddef.h> #define __malloc_size_t size_t -#else -#define __malloc_size_t unsigned int -#endif extern __malloc_size_t _bytes_used; -extern int __malloc_extra_blocks; +extern __malloc_size_t __malloc_extra_blocks; #endif /* not DOUG_LEA_MALLOC */ @@ -3769,7 +3767,7 @@ { mark_object (&img->spec); - if (!GC_NILP (img->data.lisp_val)) + if (!NILP (img->data.lisp_val)) mark_object (&img->data.lisp_val); }