diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-10-23 02:50:48 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-10-23 02:50:48 -0700 |
| commit | 394bdb8f2317e312d39e071b588581802dd3027a (patch) | |
| tree | 159fc5496fbecff8760a3c434e82f95f67e99e61 /src/w32heap.c | |
| parent | 46288dd6321e2ff4028781383660786050933304 (diff) | |
| parent | 50fa7d64d36c3f2d6ab11e7136575fbca7012cae (diff) | |
| download | emacs-394bdb8f2317e312d39e071b588581802dd3027a.tar.gz | |
Merge from origin/emacs-25
50fa7d6 ;* src/w32heap.c: Fix typo and wording of the comments.
6f1325e electric-quote mode no longer worries about coding
c2a1792 * src/regex.c (re_search_2): Make new code safe for -Wjump-mi...
f6134bb Port to GCC 6.2.1 + --enable-gcc-warnings
b2ba630 Explain how to debug emacsclient lisp errors
9da53e2 Let describe-function work for lambda again
5c2da93 Fix kill-line's docstring
ad66b3f Fix handling of allocation in regex matching
5a26c9b * lisp/electric.el (electric-quote-mode): Improve doc (Bug#24...
3877c91 vc-region-history: Search just on lines intersecting the region
8988327 Fix documentation of 'alist-get'
b6998ea * src/regex.h (re_match_object): Improve commentary.
# Conflicts:
# etc/NEWS
# lisp/help-fns.el
Diffstat (limited to 'src/w32heap.c')
| -rw-r--r-- | src/w32heap.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/w32heap.c b/src/w32heap.c index 658a8a5d691..443472b4708 100644 --- a/src/w32heap.c +++ b/src/w32heap.c @@ -129,18 +129,18 @@ static DWORD_PTR committed = 0; /* The maximum block size that can be handled by a non-growable w32 heap is limited by the MaxBlockSize value below. - This point deserves and explanation. + This point deserves an explanation. - The W32 heap allocator can be used for a growable - heap or a non-growable one. + The W32 heap allocator can be used for a growable heap or a + non-growable one. A growable heap is not compatible with a fixed base address for the heap. Only a non-growable one is. One drawback of non-growable heaps is that they can hold only objects smaller than a certain - size (the one defined below). Most of the largest blocks are GC'ed - before dumping. In any case and to be safe, we implement a simple + size (the one defined below). Most of the larger blocks are GC'ed + before dumping. In any case, and to be safe, we implement a simple first-fit allocation algorithm starting at the end of the - dumped_data[] array like depicted below: + dumped_data[] array as depicted below: ---------------------------------------------- | | | | @@ -273,7 +273,7 @@ init_heap (void) else { /* Find the RtlCreateHeap function. Headers for this function - are provided with the w32 ddk, but the function is available + are provided with the w32 DDK, but the function is available in ntdll.dll since XP. */ HMODULE hm_ntdll = LoadLibrary ("ntdll.dll"); RtlCreateHeap_Proc s_pfn_Rtl_Create_Heap |