summaryrefslogtreecommitdiff
path: root/nt/inc
diff options
context:
space:
mode:
authorJussi Lahdenniemi <jussi@aprikoodi.fi>2016-01-16 11:11:12 +0200
committerEli Zaretskii <eliz@gnu.org>2016-01-16 11:11:12 +0200
commit15c23aaf8368215613b0ffd02fe3bb742935f12e (patch)
tree49ef2d902791b43feff3cecaaa5b82f4ccb3d6b5 /nt/inc
parent39afa422ad0b3cef00292e260d424b7cd589b90d (diff)
downloademacs-15c23aaf8368215613b0ffd02fe3bb742935f12e.tar.gz
Ensure 8-byte aligned memory allocation on MS-Windows 9X
* src/w32heap.c (init_heap): Redirect malloc, realloc, and free to special functions on Windows 9X. Refuse to dump Emacs on Windows 9X. (malloc_after_dump_9x, realloc_after_dump_9x) (free_after_dump_9x): New functions. (Bug#22379) See also http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00852.html for more details about the original problem. * nt/inc/ms-w32.h (malloc_after_dump_9x, realloc_after_dump_9x) (free_after_dump_9x): Add prototypes. Copyright-paperwork-exempt: yes
Diffstat (limited to 'nt/inc')
-rw-r--r--nt/inc/ms-w32.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index cdbfac03c64..a37510e7457 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -457,6 +457,10 @@ extern void *malloc_after_dump(size_t);
extern void *realloc_after_dump(void *, size_t);
extern void free_after_dump(void *);
+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 malloc_fn the_malloc_fn;
extern realloc_fn the_realloc_fn;
extern free_fn the_free_fn;