diff options
-rw-r--r-- | regen/warnings.pl | 10 | ||||
-rw-r--r-- | warnings.h | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/regen/warnings.pl b/regen/warnings.pl index 99a765ae1c..cf07974693 100644 --- a/regen/warnings.pl +++ b/regen/warnings.pl @@ -317,9 +317,9 @@ my ($index, $warn_size); print $warn <<'EOM'; -#define Off(x) ((x) / 8) -#define Bit(x) (1 << ((x) % 8)) -#define IsSet(a, x) ((a)[Off(x)] & Bit(x)) +#define Perl_Warn_Off_(x) ((x) / 8) +#define Perl_Warn_Bit_(x) (1 << ((x) % 8)) +#define PerlWarnIsSet_(a, x) ((a)[Perl_Warn_Off_(x)] & Perl_Warn_Bit_(x)) #define G_WARN_OFF 0 /* $^W == 0 */ @@ -383,8 +383,8 @@ EOM #define isLEXWARN_off \ cBOOL(!PL_curcop || 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)) +#define isWARN_on(c,x) (PerlWarnIsSet_((U8 *)(c + 1), 2*(x))) +#define isWARNf_on(c,x) (PerlWarnIsSet_((U8 *)(c + 1), 2*(x)+1)) #define DUP_WARNINGS(p) Perl_dup_warnings(aTHX_ p) diff --git a/warnings.h b/warnings.h index f2008fe935..4d5b3ef1d5 100644 --- a/warnings.h +++ b/warnings.h @@ -5,9 +5,9 @@ */ -#define Off(x) ((x) / 8) -#define Bit(x) (1 << ((x) % 8)) -#define IsSet(a, x) ((a)[Off(x)] & Bit(x)) +#define Perl_Warn_Off_(x) ((x) / 8) +#define Perl_Warn_Bit_(x) (1 << ((x) % 8)) +#define PerlWarnIsSet_(a, x) ((a)[Perl_Warn_Off_(x)] & Perl_Warn_Bit_(x)) #define G_WARN_OFF 0 /* $^W == 0 */ @@ -139,8 +139,8 @@ #define isLEXWARN_off \ cBOOL(!PL_curcop || 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)) +#define isWARN_on(c,x) (PerlWarnIsSet_((U8 *)(c + 1), 2*(x))) +#define isWARNf_on(c,x) (PerlWarnIsSet_((U8 *)(c + 1), 2*(x)+1)) #define DUP_WARNINGS(p) Perl_dup_warnings(aTHX_ p) |