Add missing parens in Windows macros and remove defensive ones in context.c.

git-svn-id: https://svn.r-project.org/R/trunk@86205 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: luke

src/gnuwin32/fixed/h/psignal.h

@@ -163,14 +163,14 @@ int sigsuspend(sigset_t* sigset_Info);
 
 we only currently use the case sm=0, so avoid compiler warnings by */
 
-#define sigsetjmp(jb, sm) (jb->mask_was_saved=0, setjmp(jb->jmpbuf))
+#define sigsetjmp(jb, sm) ((jb)->mask_was_saved=0, setjmp((jb)->jmpbuf))
 
 
 /* We can transform this in a function but ... */
 
-#define siglongjmp(jb, val) (((jb->mask_was_saved)?\
-               sigprocmask(SIG_SETMASK, &jb->saved_mask, 0):0),\
-               longjmp(jb->jmpbuf, val))
+#define siglongjmp(jb, val) ((((jb)->mask_was_saved)?\
+               sigprocmask(SIG_SETMASK, &(jb)->saved_mask, 0):0),\
+               longjmp((jb)->jmpbuf, val))
 
 
 

src/main/context.c

@@ -241,7 +241,7 @@ attribute_hidden void NORET R_jumpctxt(RCNTXT * targetcptr, int mask, SEXP val)
     /* usually cptr->cjmpbuf_ptr == NULL, but bcEval_loop() sets a
        non-NULL value to share a jmpbuf among several contexts */
     if (cptr->cjmpbuf_ptr)
-	LONGJMP((*(cptr->cjmpbuf_ptr)), mask); //**** extra parens until Windows macro is fixed
+	LONGJMP(*(cptr->cjmpbuf_ptr), mask);
     else
 	LONGJMP(cptr->cjmpbuf, mask);
 }