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.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/eval.c b/src/eval.c
index 953a41e4b1e..06888ca0dd4 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2299,7 +2299,7 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0,
       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 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0,
           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 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
 
       if (XSUBR (fun)->max_args == MANY)
         {
-          val = (XSUBR (fun)->function.am) (numargs, args + 1);
+          val = (XSUBR (fun)->function.aMANY) (numargs, args + 1);
           goto done;
         }