diff 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
line wrap: on
line diff
--- a/src/ralloc.c	Tue Oct 25 08:32:50 2005 +0000
+++ b/src/ralloc.c	Tue Oct 25 11:16:49 2005 +0000
@@ -274,22 +274,22 @@
      get more space.  */
   if (heap == NIL_HEAP)
     {
-      POINTER new = (*real_morecore)(0);
+      POINTER new_ = (*real_morecore)(0);
       size_t get;
 
       already_available = (char *)last_heap->end - (char *)address;
 
-      if (new != last_heap->end)
+      if (new_ != last_heap->end)
 	{
 	  /* Someone else called sbrk.  Make a new heap.  */
 
-	  heap_ptr new_heap = (heap_ptr) MEM_ROUNDUP (new);
+	  heap_ptr new_heap = (heap_ptr) MEM_ROUNDUP (new_);
 	  POINTER bloc_start = (POINTER) MEM_ROUNDUP ((POINTER)(new_heap + 1));
 
-	  if ((*real_morecore) (bloc_start - new) != new)
+	  if ((*real_morecore) (bloc_start - new_) != new_)
 	    return 0;
 
-	  new_heap->start = new;
+	  new_heap->start = new_;
 	  new_heap->end = bloc_start;
 	  new_heap->bloc_start = bloc_start;
 	  new_heap->free = bloc_start;