semicolon-friendly diagnostic control

New macros {GCC,CLANG}_DIAG_{IGNORE,RESTORE}_{DECL,STMT}, which take a
following semicolon.  It is necessary to use the _DECL or _STMT version
as appropriate to the context.  Fixes [perl #130726].

1 files changed, 2 insertions, 2 deletions

diff --git a/taint.c b/taint.c
index ae0c2c9d84..72216f85de 100644
--- a/taint.c
+++ b/taint.c
@@ -62,14 +62,14 @@ Perl_taint_proper(pTHX_ const char *f, const char *const s)
         /* XXX because taint_proper adds extra format args, we can't
          * get the caller to check properly; o we just silence the warning
          * and hope the callers aren't naughty */
-        GCC_DIAG_IGNORE(-Wformat-nonliteral);
+        GCC_DIAG_IGNORE_STMT(-Wformat-nonliteral);
 	if (PL_unsafe || TAINT_WARN_get) {
 	    Perl_ck_warner_d(aTHX_ packWARN(WARN_TAINT), f, s, ug);
         }
         else {
             Perl_croak(aTHX_ f, s, ug);
         }
-        GCC_DIAG_RESTORE;
+        GCC_DIAG_RESTORE_STMT;
 
     }
 }