comparison src/ralloc.c @ 3025:facf3239ba30

[xemacs-hg @ 2005-10-25 11:16:19 by ben] rename new->new_, convert 'foo to `foo' EmacsFrame.c, ExternalClient.c, ExternalShell.c, chartab.c, cmdloop.c, compiler.h, console.c, database.c, device-msw.c, device-x.c, device.c, doc.c, dragdrop.c, eval.c, event-msw.c, event-stream.c, events.c, extents.c, file-coding.c, fns.c, frame-tty.c, frame.c, gpmevent.c, gutter.c, hash.c, imgproc.c, indent.c, keymap.c, lisp-union.h, macros.c, malloc.c, marker.c, menubar-x.c, menubar.c, mule-charset.c, number.c, process.c, profile.h, ralloc.c, redisplay.c, select-common.h, select.c, syntax.c, sysfile.h, sysproc.h, systime.h, syswindows.h, toolbar.c, tooltalk.c, tparam.c, unexaix.c, unexalpha.c, unexconvex.c, unexec.c, unexhp9k800.c, unexmips.c, unicode.c, window.c: new -> new_. 'foo -> `foo'. lwlib-internal.h: redo assert macros to follow lisp.h and not trigger warnings. lwlib.c, xlwtabs.c: new -> new_.
author ben
date Tue, 25 Oct 2005 11:16:49 +0000
parents d3bdda4872ac
children d674024a8674
comparison
equal deleted inserted replaced
3024:b7f26b2f78bd 3025:facf3239ba30
272 272
273 /* If we can't fit them within any existing heap, 273 /* If we can't fit them within any existing heap,
274 get more space. */ 274 get more space. */
275 if (heap == NIL_HEAP) 275 if (heap == NIL_HEAP)
276 { 276 {
277 POINTER new = (*real_morecore)(0); 277 POINTER new_ = (*real_morecore)(0);
278 size_t get; 278 size_t get;
279 279
280 already_available = (char *)last_heap->end - (char *)address; 280 already_available = (char *)last_heap->end - (char *)address;
281 281
282 if (new != last_heap->end) 282 if (new_ != last_heap->end)
283 { 283 {
284 /* Someone else called sbrk. Make a new heap. */ 284 /* Someone else called sbrk. Make a new heap. */
285 285
286 heap_ptr new_heap = (heap_ptr) MEM_ROUNDUP (new); 286 heap_ptr new_heap = (heap_ptr) MEM_ROUNDUP (new_);
287 POINTER bloc_start = (POINTER) MEM_ROUNDUP ((POINTER)(new_heap + 1)); 287 POINTER bloc_start = (POINTER) MEM_ROUNDUP ((POINTER)(new_heap + 1));
288 288
289 if ((*real_morecore) (bloc_start - new) != new) 289 if ((*real_morecore) (bloc_start - new_) != new_)
290 return 0; 290 return 0;
291 291
292 new_heap->start = new; 292 new_heap->start = new_;
293 new_heap->end = bloc_start; 293 new_heap->end = bloc_start;
294 new_heap->bloc_start = bloc_start; 294 new_heap->bloc_start = bloc_start;
295 new_heap->free = bloc_start; 295 new_heap->free = bloc_start;
296 new_heap->next = NIL_HEAP; 296 new_heap->next = NIL_HEAP;
297 new_heap->prev = last_heap; 297 new_heap->prev = last_heap;