[Emacs-diffs] Changes to emacs/src/emacs.c

[Jan Djärv]

Index: emacs/src/emacs.c
diff -c emacs/src/emacs.c:1.345 emacs/src/emacs.c:1.346
*** emacs/src/emacs.c:1.345     Sun Nov  7 01:57:27 2004
--- emacs/src/emacs.c   Sun Nov  7 21:59:19 2004
***************
*** 2179,2194 ****
    if (! noninteractive)
      error ("Dumping Emacs works only in batch mode");
  
    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, 
"**************************************************\n");
      }
  
    /* Bind `command-line-processed' to nil before dumping,
       so that the dumped Emacs will process its command line
--- 2179,2197 ----
    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 (%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