X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fralloc.c;h=623d6a4f21247910f8b719b9918ec594deff2bef;hb=580d242715ff07cb3db6e14c44a2e3f74bab5611;hp=ea8f8f883ce5be483a9741ec4e597f100dd0fa7b;hpb=3890a2e3064a7f562107c58e59d928284ec04741;p=chise%2Fxemacs-chise.git

diff --git a/src/ralloc.c b/src/ralloc.c
index ea8f8f8..623d6a4 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -103,7 +103,7 @@ static POINTER virtual_break_value;
 static POINTER break_value;
 
 /* This is the size of a page.  We round memory requests to this boundary.  */
-static int page_size;
+static size_t page_size;
 
 /* Whenever we get memory from the system, get this many extra bytes.  This
    must be a multiple of page_size.  */
@@ -889,7 +889,7 @@ r_alloc_sbrk (ptrdiff_t size)
     }
   else /* size < 0 */
     {
-      size_t excess = (char *)first_heap->bloc_start
+      EMACS_INT excess = (char *)first_heap->bloc_start
 		      - ((char *)virtual_break_value + size);
 
       address = virtual_break_value;
@@ -1438,7 +1438,7 @@ typedef struct alloc_dll
 
 static MMAP_HANDLE mmap_start = 0; /* Head of linked list */
 static size_t page_size = 0;	/* Size of VM pages */
-static int mmap_hysteresis;	/* Should be size_t, really. */
+static Fixnum mmap_hysteresis;	/* Logically a "size_t" */
 
 /* Get a new handle for a fresh block. */
 static MMAP_HANDLE
@@ -2022,6 +2022,10 @@ init_ralloc (void)
   if (r_alloc_initialized > 1)
     return;	/* used to return 1 */
 
+#ifdef PDUMP
+  /* Under pdump, we need to activate ralloc on the first go. */
+  ++r_alloc_initialized;
+#endif
   if (++r_alloc_initialized == 1)
     return;	/* used to return 1 */