From: Jan Djärv Date: Sun, 7 Nov 2004 21:59:19 +0000 (+0000) Subject: * emacs.c (Fdump_emacs): Only output warning on GNU/Linux. X-Git-Tag: ttn-vms-21-2-B4~4121 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c37caf9d6bd241ec9a2006164441d2b3dd5a5ae8;p=emacs.git * emacs.c (Fdump_emacs): Only output warning on GNU/Linux. --- diff --git a/src/ChangeLog b/src/ChangeLog index ae4ef621f7e..cd1fa804ca2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2004-11-07 Jan Dj,Ad(Brv + + * emacs.c (Fdump_emacs): Only output warning on GNU/Linux. + 2004-11-07 Andreas Schwab * lisp.h: Declare Fmsdos_downcase_filename. diff --git a/src/emacs.c b/src/emacs.c index e24b79aa116..3ca1022a08e 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -2179,16 +2179,19 @@ You must run Emacs in batch mode in order to dump it. */) 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