diff options
| -rw-r--r-- | cop.h | 4 | ||||
| -rw-r--r-- | perl.h | 2 | ||||
| -rw-r--r-- | regcomp.h | 2 | ||||
| -rw-r--r-- | regen/warnings.pl | 4 | ||||
| -rw-r--r-- | warnings.h | 4 |
5 files changed, 8 insertions, 8 deletions
@@ -1055,8 +1055,8 @@ typedef struct stackinfo PERL_SI; } \ } STMT_END -#define IN_PERL_COMPILETIME (PL_curcop == &PL_compiling) -#define IN_PERL_RUNTIME (PL_curcop != &PL_compiling) +#define IN_PERL_COMPILETIME cBOOL(PL_curcop == &PL_compiling) +#define IN_PERL_RUNTIME cBOOL(PL_curcop != &PL_compiling) @@ -5275,7 +5275,7 @@ EXTCONST char *const PL_phase_names[]; /* Do not use this macro. It only exists for extensions that rely on PL_dirty * instead of using the newer PL_phase, which provides everything PL_dirty * provided, and more. */ -# define PL_dirty (PL_phase == PERL_PHASE_DESTRUCT) +# define PL_dirty cBOOL(PL_phase == PERL_PHASE_DESTRUCT) # define PL_amagic_generation PL_na #endif /* !PERL_CORE */ @@ -368,7 +368,7 @@ struct regnode_ssc { #define REG_MAGIC 0234 -#define SIZE_ONLY (RExC_emit == (regnode *) & RExC_emit_dummy) +#define SIZE_ONLY cBOOL(RExC_emit == (regnode *) & RExC_emit_dummy) #define PASS1 SIZE_ONLY #define PASS2 (! SIZE_ONLY) diff --git a/regen/warnings.pl b/regen/warnings.pl index d81a078ccf..22c9c1531f 100644 --- a/regen/warnings.pl +++ b/regen/warnings.pl @@ -358,8 +358,8 @@ EOM print $warn <<'EOM'; -#define isLEXWARN_on (PL_curcop->cop_warnings != pWARN_STD) -#define isLEXWARN_off (PL_curcop->cop_warnings == pWARN_STD) +#define isLEXWARN_on cBOOL(PL_curcop->cop_warnings != pWARN_STD) +#define isLEXWARN_off cBOOL(PL_curcop->cop_warnings == pWARN_STD) #define isWARN_ONCE (PL_dowarn & (G_WARN_ON|G_WARN_ONCE)) #define isWARN_on(c,x) (IsSet((U8 *)(c + 1), 2*(x))) #define isWARNf_on(c,x) (IsSet((U8 *)(c + 1), 2*(x)+1)) diff --git a/warnings.h b/warnings.h index 4ab2d1d240..337bef374c 100644 --- a/warnings.h +++ b/warnings.h @@ -115,8 +115,8 @@ #define WARN_ALLstring "\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125" #define WARN_NONEstring "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" -#define isLEXWARN_on (PL_curcop->cop_warnings != pWARN_STD) -#define isLEXWARN_off (PL_curcop->cop_warnings == pWARN_STD) +#define isLEXWARN_on cBOOL(PL_curcop->cop_warnings != pWARN_STD) +#define isLEXWARN_off cBOOL(PL_curcop->cop_warnings == pWARN_STD) #define isWARN_ONCE (PL_dowarn & (G_WARN_ON|G_WARN_ONCE)) #define isWARN_on(c,x) (IsSet((U8 *)(c + 1), 2*(x))) #define isWARNf_on(c,x) (IsSet((U8 *)(c + 1), 2*(x)+1)) |