aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2013-01-22 15:30:17 +0200
committerEli Zaretskii2013-01-22 15:30:17 +0200
commit81abbb95448708ac28485d469e3b04749d1b8b08 (patch)
tree32373d9170451fc7e9a5c4ef91f0845b36b01102 /src
parentba14c607ba7fdadb494b57a9788997059ba510bf (diff)
downloademacs-81abbb95448708ac28485d469e3b04749d1b8b08.tar.gz
emacs-81abbb95448708ac28485d469e3b04749d1b8b08.zip
Fix bug #13065 with file selector dialog on Windows 7.
src/w32heap.c (allocate_heap) [!_WIN64]: Decrease the initial request of memory reservation to 1.7GB.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32heap.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 623d9e4877f..e7ab13311e1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-01-22 Eli Zaretskii <eliz@gnu.org>
2
3 * w32heap.c (allocate_heap) [!_WIN64]: Decrease the initial
4 request of memory reservation to 1.7GB. (Bug#13065)
5
12013-01-20 Andreas Schwab <schwab@linux-m68k.org> 62013-01-20 Andreas Schwab <schwab@linux-m68k.org>
2 7
3 * coding.c (detect_coding_iso_2022): Move back mis-reordered code 8 * coding.c (detect_coding_iso_2022): Move back mis-reordered code
diff --git a/src/w32heap.c b/src/w32heap.c
index 9c189dbda6d..81206ce2834 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -98,7 +98,11 @@ allocate_heap (void)
98#ifdef _WIN64 98#ifdef _WIN64
99 size_t size = 0x4000000000i64; /* start by asking for 32GB */ 99 size_t size = 0x4000000000i64; /* start by asking for 32GB */
100#else 100#else
101 size_t size = 0x80000000; /* start by asking for 2GB */ 101 /* We used to start with 2GB here, but on Windows 7 that would leave
102 too little room in the address space for threads started by
103 Windows on our behalf, e.g. when we pop up the file selection
104 dialog. */
105 size_t size = 0x68000000; /* start by asking for 1.7GB */
102#endif 106#endif
103 void *ptr = NULL; 107 void *ptr = NULL;
104 108