diff options
| author | Jan Djärv | 2004-11-07 21:59:19 +0000 |
|---|---|---|
| committer | Jan Djärv | 2004-11-07 21:59:19 +0000 |
| commit | c37caf9d6bd241ec9a2006164441d2b3dd5a5ae8 (patch) | |
| tree | c30b7803e6f54a5477a07c21f48e506dba53cd6c /src | |
| parent | 947faf4fe70971232287fa539ecd8fd176df15e6 (diff) | |
| download | emacs-c37caf9d6bd241ec9a2006164441d2b3dd5a5ae8.tar.gz emacs-c37caf9d6bd241ec9a2006164441d2b3dd5a5ae8.zip | |
* emacs.c (Fdump_emacs): Only output warning on GNU/Linux.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/emacs.c | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ae4ef621f7e..cd1fa804ca2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2004-11-07 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * emacs.c (Fdump_emacs): Only output warning on GNU/Linux. | ||
| 4 | |||
| 1 | 2004-11-07 Andreas Schwab <schwab@suse.de> | 5 | 2004-11-07 Andreas Schwab <schwab@suse.de> |
| 2 | 6 | ||
| 3 | * lisp.h: Declare Fmsdos_downcase_filename. | 7 | * 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. */) | |||
| 2179 | if (! noninteractive) | 2179 | if (! noninteractive) |
| 2180 | error ("Dumping Emacs works only in batch mode"); | 2180 | error ("Dumping Emacs works only in batch mode"); |
| 2181 | 2181 | ||
| 2182 | #ifdef __linux__ | ||
| 2182 | if (heap_bss_diff > MAX_HEAP_BSS_DIFF) | 2183 | if (heap_bss_diff > MAX_HEAP_BSS_DIFF) |
| 2183 | { | 2184 | { |
| 2184 | fprintf (stderr, "**************************************************\n"); | 2185 | fprintf (stderr, "**************************************************\n"); |
| 2185 | fprintf (stderr, "Warning: Your system has a gap between BSS and the\n"); | 2186 | fprintf (stderr, "Warning: Your system has a gap between BSS and the\n"); |
| 2186 | fprintf (stderr, "heap. This usually means that exec-shield or\n"); | 2187 | fprintf (stderr, "heap (%d byte). This usually means that exec-shield\n", |
| 2187 | fprintf (stderr, "something similar is in effect. The dump may fail\n"); | 2188 | heap_bss_diff); |
| 2188 | fprintf (stderr, "because of this. See the section about exec-shield\n"); | 2189 | fprintf (stderr, "or something similar is in effect. The dump may\n"); |
| 2189 | fprintf (stderr, "in etc/PROBLEMS for more information.\n"); | 2190 | fprintf (stderr, "fail because of this. See the section about \n"); |
| 2191 | fprintf (stderr, "exec-shield in etc/PROBLEMS for more information.\n"); | ||
| 2190 | fprintf (stderr, "**************************************************\n"); | 2192 | fprintf (stderr, "**************************************************\n"); |
| 2191 | } | 2193 | } |
| 2194 | #endif /* __linux__ */ | ||
| 2192 | 2195 | ||
| 2193 | /* Bind `command-line-processed' to nil before dumping, | 2196 | /* Bind `command-line-processed' to nil before dumping, |
| 2194 | so that the dumped Emacs will process its command line | 2197 | so that the dumped Emacs will process its command line |