diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2014-06-03 13:01:08 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2014-06-03 13:01:08 +0300 |
| commit | 221e0a20f60027c6e393166b7b3d18e01d704fa3 (patch) | |
| tree | a7bb419d93c248edd25a94faee9513362b761e7f /src | |
| parent | 5830a2929414675f29542ba71a88ade4e55d2a6b (diff) | |
| download | emacs-221e0a20f60027c6e393166b7b3d18e01d704fa3.tar.gz emacs-221e0a20f60027c6e393166b7b3d18e01d704fa3.tar.bz2 emacs-221e0a20f60027c6e393166b7b3d18e01d704fa3.zip | |
More minor cleanups in src/w32heap.c.
src/w32heap.c (calloc): Don't undef, it is never defined.
(HEAP_ENTRY_SHIFT): Remove unused macro.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/w32heap.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f0ea2885b8c..d099ca757bf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -3,6 +3,8 @@ * w32heap.c (DUMPED_HEAP_SIZE): Move from w32heap.h. Don't use HEAPSIZE; instead, define separate values for the 32- and 64-bit builds. + (calloc): Don't undef, it is never defined. + (HEAP_ENTRY_SHIFT): Remove unused macro. * Makefile.in (C_HEAP_SWITCH): Remove. (ALL_CFLAGS): Don't use $(C_HEAP_SWITCH). diff --git a/src/w32heap.c b/src/w32heap.c index f08e1078b0a..e6ca432a5ef 100644 --- a/src/w32heap.c +++ b/src/w32heap.c @@ -122,9 +122,7 @@ typedef struct _RTL_HEAP_PARAMETERS { static unsigned char dumped_data[DUMPED_HEAP_SIZE]; -/* Info for managing our preload heap, which is essentially a fixed size - data area in the executable. */ -/* Info for keeping track of our heap. */ +/* Info for keeping track of our dynamic heap used after dumping. */ unsigned char *data_region_base = NULL; unsigned char *data_region_end = NULL; static DWORD_PTR committed = 0; @@ -155,7 +153,9 @@ static DWORD_PTR committed = 0; + committed */ -#define HEAP_ENTRY_SHIFT 3 + +/* Info for managing our preload heap, which is essentially a fixed size + data area in the executable. */ #define PAGE_SIZE 0x1000 #define MaxBlockSize (0x80000 - PAGE_SIZE) @@ -296,7 +296,6 @@ init_heap (void) #undef malloc #undef realloc -#undef calloc #undef free /* FREEABLE_P checks if the block can be safely freed. */ |