diff src/emacs.c @ 2286:04bc9d2f42c7

[xemacs-hg @ 2004-09-20 19:18:55 by james] Mark all unused parameters as unused. Also eliminate some unneeded local variables.
author james
date Mon, 20 Sep 2004 19:20:08 +0000
parents 61855263cb07
children ecf1ebac70d8
line wrap: on
line diff
--- a/src/emacs.c	Mon Sep 20 19:11:29 2004 +0000
+++ b/src/emacs.c	Mon Sep 20 19:20:08 2004 +0000
@@ -702,7 +702,13 @@
 */
 DECLARE_DOESNT_RETURN (main_1 (int, Extbyte **, Extbyte **, int));
 DOESNT_RETURN
-main_1 (int argc, Extbyte **argv, Extbyte **envp, int restart)
+main_1 (int argc, Extbyte **argv,
+#if defined (WIN32_NATIVE) || defined (_SCO_DS)
+	Extbyte **envp,
+#else
+	Extbyte **UNUSED (envp),
+#endif
+	int restart)
 {
   char stack_bottom_variable;
   int skip_args = 0;
@@ -3361,12 +3367,12 @@
 /* GCC >= 2.8.  -slb */
 #if defined (GNU_MALLOC)
 static void
-voodoo_free_hook (void *mem)
+voodoo_free_hook (void *UNUSED (mem))
 {
   /* Disable all calls to free() when XEmacs is exiting and it doesn't */
   /* matter. */
   __free_hook =
-#ifdef TYPEOF
+#if defined (TYPEOF) && !defined (UNO)
     /* prototype of __free_hook varies with glibc version */
     (TYPEOF (__free_hook))
 #endif
@@ -3432,7 +3438,7 @@
 
 #if defined (GNU_MALLOC)
   __free_hook =
-#ifdef TYPEOF
+#if defined (TYPEOF) && !defined (UNO)
     /* prototype of __free_hook varies with glibc version */
     (TYPEOF (__free_hook))
 #endif