diff src/emacs.c @ 90044:cb7f41387eb3

Revision: [e-mail]--gnu-2004/emacs--unicode--0--patch-70 Merge from emacs--cvs-trunk--0 Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-669 - [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-678 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-679 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-680 - [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-688 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-689 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-690 - [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-691 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-69 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-70 - [e-mail]--gnu-2004/gnus--rel--5.10--patch-71 Update from CVS

--- a/src/emacs.c	Thu Nov 04 08:55:40 2004 +0000
+++ b/src/emacs.c	Fri Nov 12 02:53:04 2004 +0000
@@ -1626,16 +1626,14 @@
       keys_of_minibuf ();
       keys_of_window ();
     }
-	else
+  else
     {
-      /*
-        Initialization that must be done even if the global variable
-        initialized is non zero
-      */
+      /* Initialization that must be done even if the global variable
+	 initialized is non zero.  */
 #ifdef HAVE_NTGUI
       globals_of_w32fns ();
       globals_of_w32menu ();
-#endif  /* end #ifdef HAVE_NTGUI */
+#endif  /* HAVE_NTGUI */
     }
 
   init_charset ();
@@ -2189,16 +2187,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 (%lu 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
@@ -2287,7 +2288,7 @@
     {
       *plocale = desired_locale;
       setlocale (category, (STRINGP (desired_locale)
-			    ? (char *)(SDATA (desired_locale))
+			    ? (char *) SDATA (desired_locale)
 			    : ""));
     }
 }