Mercurial > emacs
diff src/lisp.h @ 109476:94ad8639f676
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.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 20 Jul 2010 17:26:53 +0200 |
parents | 3e07e13fe30a |
children | 4b7ca75642a8 |
line wrap: on
line diff
--- 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