diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-01-18 22:56:34 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-01-18 22:56:34 -0800 |
| commit | 140016558bcb462692d8b9f2f3f866e0f337d218 (patch) | |
| tree | 3fd4a50444d4fff74510e2430c572a8e3fd0e4dd /nt | |
| parent | 7823745acbe9b87eea2db4ef434e379fc903ec35 (diff) | |
| parent | 3ae7934fad7cc3bbd844123bf2143f376dbfab79 (diff) | |
Merge from origin/emacs-25
3ae7934 ; * etc/NEWS: Mark entries that don't need further treatment.
6165c36 * lisp/files.el (dir-locals--all-files): Respect absolute file-names
2ffdf15 * lisp/help-fns.el (describe-variable): Fix a left-over parenthesis
71ecd62 * lisp/dired-x.el (dired-omit-here-always): Use add-dir-local-variable
f0b82b3 * lisp/files.el (dir-locals--all-files): Use completion instead of wildcards
86e4513 Fix incompatbilities with MS-Windows 2000 and older
4e96521 Mention in PROBLEMS an issue with MS-Windows NT4
15c23aa Ensure 8-byte aligned memory allocation on MS-Windows 9X
39afa42 Fix tests for active region in hideif.el
05df666 Fix interactive specs in some hideif.el commands
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/inc/ms-w32.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index cdbfac03c6..a37510e745 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; |