[Emacs-diffs] emacs-24 r117695: Fix bug #18995 with compiling w32heap.c with -funroll-loops.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117695
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18995
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-11-09 17:57:37 +0200
message:
  Fix bug #18995 with compiling w32heap.c with -funroll-loops.
  
   src/w32heap.c (allocate_heap): Set the lower limit of heap at 8MB.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/w32heap.c                  w32heap.c-20091113204419-o5vbwnq5f7feedwu-810

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-11-09 13:47:02 +0000
+++ b/src/ChangeLog     2014-11-09 15:57:37 +0000
@@ -1,3 +1,8 @@
+2014-11-09  Eli Zaretskii  <address@hidden>
+
+       * w32heap.c (allocate_heap): Set the lower limit of heap at 8MB.
+       (Bug#18995)
+
 2014-11-09  Jan Djärv  <address@hidden>
 
        * nsterm.h (EmacsScroller): judge returns bool.

=== modified file 'src/w32heap.c'
--- a/src/w32heap.c     2014-01-01 07:43:34 +0000
+++ b/src/w32heap.c     2014-11-09 15:57:37 +0000
@@ -96,7 +96,7 @@
 allocate_heap (void)
 {
 #ifdef _WIN64
-  size_t size = 0x4000000000ull; /* start by asking for 32GB */
+  size_t size = 0x4000000000ull; /* start by asking for 256GB */
 #else
   /* We used to start with 2GB here, but on Windows 7 that would leave
      too little room in the address space for threads started by
@@ -106,7 +106,7 @@
 #endif
   void *ptr = NULL;
 
-  while (!ptr && size > 0x00100000)
+  while (!ptr && size >= 0x00800000)
     {
       reserved_heap_size = size;
       ptr = VirtualAlloc (NULL,