X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fralloc.c;h=5f336a9cb29baae4db7f451afa9e7d240a6b6eaa;hb=965a56e0f7857093cdc7f9024c5173e4471911f5;hp=f895d88595b0a3081a25b35e8d1bbc2cc49aa2ec;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git diff --git a/src/ralloc.c b/src/ralloc.c index f895d88..5f336a9 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -1108,7 +1108,9 @@ r_alloc_thaw () /* The hook `malloc' uses for the function which gets more space from the system. */ -/* extern POINTER (*__morecore) (long size); */ +#ifndef DOUG_LEA_MALLOC +extern POINTER (*__morecore) (long size); +#endif /* Initialize various things for memory allocation. */ @@ -1407,12 +1409,12 @@ static int r_alloc_initialized = 0; static int DEV_ZERO_FD = -1; -/* We actually need a datastructure that can be usefully structured +/* We actually need a data structure that can be usefully structured based on the VM address, and allows an ~O(1) lookup on an arbitrary - address, ie a hash-table. Maybe the XEmacs hash table can be - coaxed enough. At the moment, we use lookup on a hash-table to + address, i.e. a hash table. Maybe the XEmacs hash table can be + coaxed enough. At the moment, we use lookup on a hash table to decide whether to do an O(n) search on the malloced block list. - Addresses are hashed to a bucket modulo MHASH_PRIME */ + Addresses are hashed to a bucket modulo MHASH_PRIME. */ /* We settle for a standard doubly-linked-list. The dynarr type isn't