# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1279639613 -7200
# Node ID 94ad8639f676574198f442b2d090345b567ab688
# Parent  692d2ce789dccfa73a1ad661ac96dcb4dd281f49
Fix up "missing braces" warning.
* src/eval.c (Feval, Ffuncall): Use the new names.
* src/lisp.h (struct Lisp_Subr): Rename `am' to aMANY and add aUNEVALLED.
(DEFUN): Add braces around the union initialisation and use ## to
specify the right union alternative and avoid a cast.

diff -r 692d2ce789dc -r 94ad8639f676 src/ChangeLog
--- a/src/ChangeLog	Tue Jul 20 13:13:25 2010 +0200
+++ b/src/ChangeLog	Tue Jul 20 17:26:53 2010 +0200
@@ -1,3 +1,11 @@
+2010-07-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* eval.c (Feval, Ffuncall): Use the new names.
+
+	* lisp.h (struct Lisp_Subr): Rename `am' to aMANY and add aUNEVALLED.
+	(DEFUN): Add braces around the union initialisation and use ## to
+	specify the right union alternative and avoid a cast.
+
 2010-07-18  Juanma Barranquero  <lekktu@gmail.com>
 
 	* makefile.w32-in ($(BLD)/keyboard.$(O)): Update dependencies.
diff -r 692d2ce789dc -r 94ad8639f676 src/eval.c
--- a/src/eval.c	Tue Jul 20 13:13:25 2010 +0200
+++ b/src/eval.c	Tue Jul 20 17:26:53 2010 +0200
@@ -2299,7 +2299,7 @@
       if (XSUBR (fun)->max_args == UNEVALLED)
 	{
 	  backtrace.evalargs = 0;
-	  val = (XSUBR (fun)->function.a1) (args_left);
+	  val = (XSUBR (fun)->function.aUNEVALLED) (args_left);
 	  goto done;
 	}
 
@@ -2325,7 +2325,7 @@
 	  backtrace.args = vals;
 	  backtrace.nargs = XINT (numargs);
 
-	  val = (XSUBR (fun)->function.am) (XINT (numargs), vals);
+	  val = (XSUBR (fun)->function.aMANY) (XINT (numargs), vals);
 	  UNGCPRO;
 	  goto done;
 	}
@@ -2968,7 +2968,7 @@
 
       if (XSUBR (fun)->max_args == MANY)
 	{
-	  val = (XSUBR (fun)->function.am) (numargs, args + 1);
+	  val = (XSUBR (fun)->function.aMANY) (numargs, args + 1);
 	  goto done;
 	}
 
diff -r 692d2ce789dc -r 94ad8639f676 src/lisp.h
--- a/src/lisp.h	Tue Jul 20 13:13:25 2010 +0200
+++ b/src/lisp.h	Tue Jul 20 17:26:53 2010 +0200
@@ -971,7 +971,8 @@
       Lisp_Object (*a6) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object);
       Lisp_Object (*a7) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object);
       Lisp_Object (*a8) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object);
-      Lisp_Object (*am) (int, Lisp_Object *);
+      Lisp_Object (*aUNEVALLED) (Lisp_Object args);
+      Lisp_Object (*aMANY) (int, Lisp_Object *);
     } function;
     short min_args, max_args;
     const char *symbol_name;
@@ -1775,7 +1776,8 @@
   Lisp_Object fnname DEFUN_ARGS_ ## maxargs ;				\
   DECL_ALIGN (struct Lisp_Subr, sname) =				\
     { PVEC_SUBR | (sizeof (struct Lisp_Subr) / sizeof (EMACS_INT)),	\
-      (Lisp_Object(*)(void)) fnname, minargs, maxargs, lname, intspec, 0}; \
+      { .a ## maxargs = fnname },				\
+      minargs, maxargs, lname, intspec, 0};				\
   Lisp_Object fnname
 
 /* Note that the weird token-substitution semantics of ANSI C makes