diff options
| author | Richard M. Stallman | 1994-11-01 07:07:32 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-11-01 07:07:32 +0000 |
| commit | cc5f52cbfa696dc1557f28b3c32f199f4620af62 (patch) | |
| tree | 14bd3dc3fbde02b80f61faf29f07b09ca691f17a /src | |
| parent | 0b39d75da88f6e94ece604239290aceaf6e29c13 (diff) | |
| download | emacs-cc5f52cbfa696dc1557f28b3c32f199f4620af62.tar.gz emacs-cc5f52cbfa696dc1557f28b3c32f199f4620af62.zip | |
(Fdump_emacs): Don't reset the data start address by
invoking memory_warnings just before unexec-ing.
Diffstat (limited to 'src')
| -rw-r--r-- | src/emacs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/emacs.c b/src/emacs.c index a943a0788d5..2e9a81a9091 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -1037,7 +1037,11 @@ and announce itself normally when it is run.") | |||
| 1037 | /* Tell malloc where start of impure now is */ | 1037 | /* Tell malloc where start of impure now is */ |
| 1038 | /* Also arrange for warnings when nearly out of space. */ | 1038 | /* Also arrange for warnings when nearly out of space. */ |
| 1039 | #ifndef SYSTEM_MALLOC | 1039 | #ifndef SYSTEM_MALLOC |
| 1040 | #ifndef WINDOWSNT | ||
| 1041 | /* On Windows, this was done before dumping, and that once suffices. | ||
| 1042 | Meanwhile, my_edata is not valid on Windows. */ | ||
| 1040 | memory_warnings (&my_edata, malloc_warning); | 1043 | memory_warnings (&my_edata, malloc_warning); |
| 1044 | #endif /* not WINDOWSNT */ | ||
| 1041 | #endif | 1045 | #endif |
| 1042 | unexec (XSTRING (intoname)->data, | 1046 | unexec (XSTRING (intoname)->data, |
| 1043 | !NILP (symname) ? XSTRING (symname)->data : 0, &my_edata, 0, 0); | 1047 | !NILP (symname) ? XSTRING (symname)->data : 0, &my_edata, 0, 0); |