From 7231175158f8ebe4d4c89fd774d89f1e9de28649 Mon Sep 17 00:00:00 2001 From: Gurusamy Sarathy Date: Sun, 5 Jul 1998 00:35:27 +0000 Subject: patchlevel up to 5.004_70, various tweaks * fix taint problems due to maintbranch regression * PERL_OBJECT now builds again * deal with C++ strong-typing problems in hv.c * fix mismatch in "reserved word" diagnostic p4raw-id: //depot/perl@1311 --- regexp.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'regexp.h') diff --git a/regexp.h b/regexp.h index f1301d9102..a123efe02f 100644 --- a/regexp.h +++ b/regexp.h @@ -90,9 +90,11 @@ typedef struct regexp { #define ROPT_TAINTED_SEEN 0x8000 #define RX_MATCH_TAINTED(prog) ((prog)->reganch & ROPT_TAINTED_SEEN) -#define RX_MATCH_TAINTED_SET(prog, t) ((t) \ - ? ((prog)->reganch |= ROPT_TAINTED_SEEN) \ - : ((prog)->reganch &= ~ROPT_TAINTED_SEEN)) +#define RX_MATCH_TAINTED_on(prog) ((prog)->reganch |= ROPT_TAINTED_SEEN) +#define RX_MATCH_TAINTED_off(prog) ((prog)->reganch &= ~ROPT_TAINTED_SEEN) +#define RX_MATCH_TAINTED_set(prog, t) ((t) \ + ? RX_MATCH_TAINTED_on(prog) \ + : RX_MATCH_TAINTED_off(prog)) #define REXEC_COPY_STR 1 /* Need to copy the string. */ #define REXEC_CHECKED 2 /* check_substr already checked. */ -- cgit v1.2.1