diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2020-01-03 18:27:35 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2020-01-03 18:27:35 +0200 |
| commit | 2b6d702e5d2d572640c6bcd43f54138bacbe7ac8 (patch) | |
| tree | 0583cef4073643f6a9d1529d9df09089ae93e93c /nt | |
| parent | fa7148fd5ac7c10c32a1cdcf57ade55bc3be8718 (diff) | |
| download | emacs-2b6d702e5d2d572640c6bcd43f54138bacbe7ac8.tar.gz | |
Fix the MS-Windows build broken by "Let the OS clear large new objects"
* src/w32heap.c (sys_calloc): New function, implements calloc
in terms of our private implementations of malloc.
* nt/inc/ms-w32.h (calloc): Redirect to sys_calloc.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/inc/ms-w32.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index 6d20c959a3f..3b1d3ff0393 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h @@ -499,6 +499,8 @@ extern void *malloc_after_dump_9x(size_t); extern void *realloc_after_dump_9x(void *, size_t); extern void free_after_dump_9x(void *); +extern void *sys_calloc(size_t, size_t); + extern malloc_fn the_malloc_fn; extern realloc_fn the_realloc_fn; extern free_fn the_free_fn; @@ -506,6 +508,7 @@ extern free_fn the_free_fn; #define malloc(size) (*the_malloc_fn)(size) #define free(ptr) (*the_free_fn)(ptr) #define realloc(ptr, size) (*the_realloc_fn)(ptr, size) +#define calloc(num, size) sys_calloc(num, size) #endif |