1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-15 09:47:20 +00:00

* emacs.c (Fdump_emacs): Only output warning on GNU/Linux.

This commit is contained in:
Jan Djärv 2004-11-07 21:59:19 +00:00
parent 947faf4fe7
commit c37caf9d6b
2 changed files with 11 additions and 4 deletions

View File

@ -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> 2004-11-07 Andreas Schwab <schwab@suse.de>
* lisp.h: Declare Fmsdos_downcase_filename. * lisp.h: Declare Fmsdos_downcase_filename.

View File

@ -2179,16 +2179,19 @@ You must run Emacs in batch mode in order to dump it. */)
if (! noninteractive) if (! noninteractive)
error ("Dumping Emacs works only in batch mode"); error ("Dumping Emacs works only in batch mode");
#ifdef __linux__
if (heap_bss_diff > MAX_HEAP_BSS_DIFF) if (heap_bss_diff > MAX_HEAP_BSS_DIFF)
{ {
fprintf (stderr, "**************************************************\n"); fprintf (stderr, "**************************************************\n");
fprintf (stderr, "Warning: Your system has a gap between BSS and the\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, "heap (%d byte). This usually means that exec-shield\n",
fprintf (stderr, "something similar is in effect. The dump may fail\n"); heap_bss_diff);
fprintf (stderr, "because of this. See the section about exec-shield\n"); fprintf (stderr, "or something similar is in effect. The dump may\n");
fprintf (stderr, "in etc/PROBLEMS for more information.\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"); fprintf (stderr, "**************************************************\n");
} }
#endif /* __linux__ */
/* Bind `command-line-processed' to nil before dumping, /* Bind `command-line-processed' to nil before dumping,
so that the dumped Emacs will process its command line so that the dumped Emacs will process its command line