From ff55dfe8323e7d261f12007bf7ff6fef9396be09 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 9 Sep 2012 18:17:23 -0700 Subject: [PATCH] Parenthesize macro bodies. * lisp.h (XSETINT, XSETCONS, XSETVECTOR, XSETSTRING, XSETSYMBOL) (XSETFLOAT, XSETMISC): Parenthesize. --- src/ChangeLog | 5 +++++ src/lisp.h | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index fac2cb5ce70..bde130fe29a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-09-10 Paul Eggert + + * lisp.h (XSETINT, XSETCONS, XSETVECTOR, XSETSTRING, XSETSYMBOL) + (XSETFLOAT, XSETMISC): Parenthesize macro bodies. + 2012-09-09 Stefan Monnier * lisp.h (make_lisp_ptr): New macro to replace XSET. diff --git a/src/lisp.h b/src/lisp.h index 44c2b087caf..240e8c08a87 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -554,16 +554,16 @@ clip_to_bounds (ptrdiff_t lower, EMACS_INT num, ptrdiff_t upper) /* Construct a Lisp_Object from a value or address. */ -#define XSETINT(a, b) (a) = make_number (b) -#define XSETCONS(a, b) (a) = make_lisp_ptr (b, Lisp_Cons) -#define XSETVECTOR(a, b) (a) = make_lisp_ptr (b, Lisp_Vectorlike) -#define XSETSTRING(a, b) (a) = make_lisp_ptr (b, Lisp_String) -#define XSETSYMBOL(a, b) (a) = make_lisp_ptr (b, Lisp_Symbol) -#define XSETFLOAT(a, b) (a) = make_lisp_ptr (b, Lisp_Float) +#define XSETINT(a, b) ((a) = make_number (b)) +#define XSETCONS(a, b) ((a) = make_lisp_ptr (b, Lisp_Cons)) +#define XSETVECTOR(a, b) ((a) = make_lisp_ptr (b, Lisp_Vectorlike)) +#define XSETSTRING(a, b) ((a) = make_lisp_ptr (b, Lisp_String)) +#define XSETSYMBOL(a, b) ((a) = make_lisp_ptr (b, Lisp_Symbol)) +#define XSETFLOAT(a, b) ((a) = make_lisp_ptr (b, Lisp_Float)) /* Misc types. */ -#define XSETMISC(a, b) (a) = make_lisp_ptr (b, Lisp_Misc) +#define XSETMISC(a, b) ((a) = make_lisp_ptr (b, Lisp_Misc)) #define XSETMARKER(a, b) (XSETMISC (a, b), XMISCTYPE (a) = Lisp_Misc_Marker) /* Pseudovector types. */ -- 2.39.2