Mercurial > emacs
changeset 58018:4d47dbf04bed
* emacs.c (Fdump_emacs): Only output warning on GNU/Linux.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Sun, 07 Nov 2004 21:59:19 +0000 |
| parents | 57d5e5e2e4db |
| children | 71ee36a5abb0 |
| files | src/ChangeLog src/emacs.c |
| diffstat | 2 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Nov 07 20:52:51 2004 +0000 +++ b/src/ChangeLog Sun Nov 07 21:59:19 2004 +0000 @@ -1,3 +1,7 @@ +2004-11-07 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * emacs.c (Fdump_emacs): Only output warning on GNU/Linux. + 2004-11-07 Andreas Schwab <schwab@suse.de> * lisp.h: Declare Fmsdos_downcase_filename.
--- a/src/emacs.c Sun Nov 07 20:52:51 2004 +0000 +++ b/src/emacs.c Sun Nov 07 21:59:19 2004 +0000 @@ -2179,16 +2179,19 @@ if (! noninteractive) error ("Dumping Emacs works only in batch mode"); +#ifdef __linux__ if (heap_bss_diff > MAX_HEAP_BSS_DIFF) { fprintf (stderr, "**************************************************\n"); fprintf (stderr, "Warning: Your system has a gap between BSS and the\n"); - fprintf (stderr, "heap. This usually means that exec-shield or\n"); - fprintf (stderr, "something similar is in effect. The dump may fail\n"); - fprintf (stderr, "because of this. See the section about exec-shield\n"); - fprintf (stderr, "in etc/PROBLEMS for more information.\n"); + fprintf (stderr, "heap (%d byte). This usually means that exec-shield\n", + heap_bss_diff); + fprintf (stderr, "or something similar is in effect. The dump may\n"); + fprintf (stderr, "fail because of this. See the section about \n"); + fprintf (stderr, "exec-shield in etc/PROBLEMS for more information.\n"); fprintf (stderr, "**************************************************\n"); } +#endif /* __linux__ */ /* Bind `command-line-processed' to nil before dumping, so that the dumped Emacs will process its command line