• Eli Zaretskii's avatar
    Clean up memory allocation and unexec support on MS-Windows · 5e3b0f52
    Eli Zaretskii authored
    * src/w32heap.c (report_temacs_memory_usage): Condition on
    !CANNOT_DUMP, in addition to ENABLE_CHECKING.
    (init_heap): Accept an argument, which tells us what heap
    allocation method to use.
    (DUMPED_HEAP_SIZE) [CANNOT_DUMP]: Define to a small value, as
    we don't use dumped_data[] in this case.
    * src/w32heap.h (init_heap): Adjust prototype.
    <using_dynamic_heap>: Remove declaration.
    * src/emacs.c (main) [WINDOWSNT]: Determine heap allocation
    method based on whether we are in temacs and whether unexec
    will be used to dump Emacs.  Pass the heap allocation method
    to init_heap, which is now called after parsing the
    --temacs=METHOD option.
    * src/unexw32.c (unexec): Don't fiddle with using_dynamic_heap.
    <using_dynamic_heap>: Remove definition.
    * src/w32proc.c (malloc_before_init, realloc_before_init)
    (free_before_init): New functions, to catch memory allocation
    before heap allocation method is set up.
unexw32.c 22.9 KB