]> git.eshelyaron.com Git - emacs.git/commitdiff
(allocate_heap): Clean up conditional.
authorRichard M. Stallman <rms@gnu.org>
Mon, 13 May 1996 15:06:32 +0000 (15:06 +0000)
committerRichard M. Stallman <rms@gnu.org>
Mon, 13 May 1996 15:06:32 +0000 (15:06 +0000)
src/w32heap.c

index 776f857f3a50904055f48e47221401d73038a6d0..6847b9345c76501181f09e99112e36427546c34f 100644 (file)
@@ -142,19 +142,25 @@ allocate_heap (void)
   unsigned long end  = 1 << VALBITS; /* 256MB */
   void *ptr = NULL;
 
-#ifdef NTHEAP_PROBE_BASE
+#if NTHEAP_PROBE_BASE /* This is never normally defined */
+  /* Try various addresses looking for one the kernel will let us have.  */
   while (!ptr && (base < end))
     {
-#endif
       reserved_heap_size = end - base;
       ptr = VirtualAlloc ((void *) base,
                          get_reserved_heap_size (),
                          MEM_RESERVE,
                          PAGE_NOACCESS);
-#ifdef NTHEAP_PROBE_BASE
       base += 0x00100000;  /* 1MB increment */
     }
+#else
+  reserved_heap_size = end - base;
+  ptr = VirtualAlloc ((void *) base,
+                     get_reserved_heap_size (),
+                     MEM_RESERVE,
+                     PAGE_NOACCESS);
 #endif
+
   return ptr;
 }