diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-01-22 15:30:17 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-01-22 15:30:17 +0200 |
| commit | 81abbb95448708ac28485d469e3b04749d1b8b08 (patch) | |
| tree | 32373d9170451fc7e9a5c4ef91f0845b36b01102 | |
| parent | ba14c607ba7fdadb494b57a9788997059ba510bf (diff) | |
| download | emacs-81abbb95448708ac28485d469e3b04749d1b8b08.tar.gz | |
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.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/w32heap.c | 6 |
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 @@ +2013-01-22 Eli Zaretskii <eliz@gnu.org> + + * w32heap.c (allocate_heap) [!_WIN64]: Decrease the initial + request of memory reservation to 1.7GB. (Bug#13065) + 2013-01-20 Andreas Schwab <schwab@linux-m68k.org> * 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) #ifdef _WIN64 size_t size = 0x4000000000i64; /* start by asking for 32GB */ #else - size_t size = 0x80000000; /* start by asking for 2GB */ + /* 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 + Windows on our behalf, e.g. when we pop up the file selection + dialog. */ + size_t size = 0x68000000; /* start by asking for 1.7GB */ #endif void *ptr = NULL; |