diff options
| -rw-r--r-- | perl.c | 22 | ||||
| -rw-r--r-- | perl.h | 4 | ||||
| -rw-r--r-- | pp_ctl.c | 2 | ||||
| -rw-r--r-- | regcomp.c | 4 | ||||
| -rw-r--r-- | regexp.h | 2 | ||||
| -rw-r--r-- | sv.c | 16 | ||||
| -rw-r--r-- | sv.h | 2 |
7 files changed, 26 insertions, 26 deletions
@@ -1857,9 +1857,9 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) break; case 't': -#if SILENT_NO_TAINT_SUPPORT +#if defined(SILENT_NO_TAINT_SUPPORT) /* silently ignore */ -#elif NO_TAINT_SUPPORT +#elif defined(NO_TAINT_SUPPORT) Perl_croak_nocontext("This perl was compiled without taint support. " "Cowardly refusing to run with -t or -T flags"); #else @@ -1872,9 +1872,9 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) s++; goto reswitch; case 'T': -#if SILENT_NO_TAINT_SUPPORT +#if defined(SILENT_NO_TAINT_SUPPORT) /* silently ignore */ -#elif NO_TAINT_SUPPORT +#elif defined(NO_TAINT_SUPPORT) Perl_croak_nocontext("This perl was compiled without taint support. " "Cowardly refusing to run with -t or -T flags"); #else @@ -1989,9 +1989,9 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) while (isSPACE(*s)) s++; if (*s == '-' && *(s+1) == 'T') { -#if SILENT_NO_TAINT_SUPPORT +#if defined(SILENT_NO_TAINT_SUPPORT) /* silently ignore */ -#elif NO_TAINT_SUPPORT +#elif defined(NO_TAINT_SUPPORT) Perl_croak_nocontext("This perl was compiled without taint support. " "Cowardly refusing to run with -t or -T flags"); #else @@ -2028,9 +2028,9 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) } } if (*d == 't') { -#if SILENT_NO_TAINT_SUPPORT +#if defined(SILENT_NO_TAINT_SUPPORT) /* silently ignore */ -#elif NO_TAINT_SUPPORT +#elif defined(NO_TAINT_SUPPORT) Perl_croak_nocontext("This perl was compiled without taint support. " "Cowardly refusing to run with -t or -T flags"); #else @@ -3377,9 +3377,9 @@ Perl_moreswitches(pTHX_ const char *s) return s; case 't': case 'T': -#if SILENT_NO_TAINT_SUPPORT +#if defined(SILENT_NO_TAINT_SUPPORT) /* silently ignore */ -#elif NO_TAINT_SUPPORT +#elif defined(NO_TAINT_SUPPORT) Perl_croak_nocontext("This perl was compiled without taint support. " "Cowardly refusing to run with -t or -T flags"); #else @@ -3872,7 +3872,7 @@ S_init_ids(pTHX) { /* no need to do anything here any more if we don't * do tainting. */ -#if !NO_TAINT_SUPPORT +#ifndef NO_TAINT_SUPPORT dVAR; const Uid_t my_uid = PerlProc_getuid(); const Uid_t my_euid = PerlProc_geteuid(); @@ -538,7 +538,7 @@ * DANGER! Using NO_TAINT_SUPPORT or SILENT_NO_TAINT_SUPPORT * voids your nonexistent warranty! */ -#if SILENT_NO_TAINT_SUPPORT && !defined(NO_TAINT_SUPPORT) +#if defined(SILENT_NO_TAINT_SUPPORT) && !defined(NO_TAINT_SUPPORT) # define NO_TAINT_SUPPORT 1 #endif @@ -546,7 +546,7 @@ * operations into no-ops for a very modest speed-up. Enable only if you * know what you're doing: tests and CPAN modules' tests are bound to fail. */ -#if NO_TAINT_SUPPORT +#ifdef NO_TAINT_SUPPORT # define TAINT NOOP # define TAINT_NOT NOOP # define TAINT_IF(c) NOOP @@ -153,7 +153,7 @@ PP(pp_regcomp) modified by get-magic), to avoid incorrectly setting the RXf_TAINTED flag with RX_TAINT_on further down. */ TAINT_set(was_tainted); -#if NO_TAINT_SUPPORT +#ifdef NO_TAINT_SUPPORT PERL_UNUSED_VAR(was_tainted); #endif } @@ -160,7 +160,7 @@ struct RExC_state_t { int num_code_blocks; /* size of code_blocks[] */ int code_index; /* next code_blocks[] slot */ SSize_t maxlen; /* mininum possible number of chars in string to match */ -#if ADD_TO_REGEXEC +#ifdef ADD_TO_REGEXEC char *starttry; /* -Dr: where regtry was called. */ #define RExC_starttry (pRExC_state->starttry) #endif @@ -7432,7 +7432,7 @@ Perl_reg_numbered_buff_fetch(pTHX_ REGEXP * const r, const I32 paren, assert(s >= rx->subbeg); assert((STRLEN)rx->sublen >= (STRLEN)((s - rx->subbeg) + i) ); if (i >= 0) { -#if NO_TAINT_SUPPORT +#ifdef NO_TAINT_SUPPORT sv_setpvn(sv, s, i); #else const int oldtainted = TAINT_get; @@ -435,7 +435,7 @@ get_regex_charset_name(const U32 flags, STRLEN* const lenp) * */ -#if NO_TAINT_SUPPORT +#ifdef NO_TAINT_SUPPORT # define RX_ISTAINTED(prog) 0 # define RX_TAINT_on(prog) NOOP # define RXp_MATCH_TAINTED(prog) 0 @@ -33,11 +33,11 @@ #include "regcomp.h" #ifndef HAS_C99 -# if __STDC_VERSION__ >= 199901L && !defined(VMS) +# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && !defined(VMS) # define HAS_C99 1 # endif #endif -#if HAS_C99 +#ifdef HAS_C99 # include <stdint.h> #endif @@ -10923,7 +10923,7 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN p case 'V': case 'z': case 't': -#if HAS_C99 +#ifdef HAS_C99 case 'j': #endif intsize = *q++; @@ -11059,7 +11059,7 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN p case 'z': iv = va_arg(*args, SSize_t); break; case 't': iv = va_arg(*args, ptrdiff_t); break; default: iv = va_arg(*args, int); break; -#if HAS_C99 +#ifdef HAS_C99 case 'j': iv = va_arg(*args, intmax_t); break; #endif case 'q': @@ -11156,7 +11156,7 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN p case 'V': uv = va_arg(*args, UV); break; case 'z': uv = va_arg(*args, Size_t); break; case 't': uv = va_arg(*args, ptrdiff_t); break; /* will sign extend, but there is no uptrdiff_t, so oh well */ -#if HAS_C99 +#ifdef HAS_C99 case 'j': uv = va_arg(*args, uintmax_t); break; #endif default: uv = va_arg(*args, unsigned); break; @@ -11492,7 +11492,7 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN p case 'V': *(va_arg(*args, IV*)) = i; break; case 'z': *(va_arg(*args, SSize_t*)) = i; break; case 't': *(va_arg(*args, ptrdiff_t*)) = i; break; -#if HAS_C99 +#ifdef HAS_C99 case 'j': *(va_arg(*args, intmax_t*)) = i; break; #endif case 'q': @@ -13370,7 +13370,7 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags, PL_origargc = proto_perl->Iorigargc; PL_origargv = proto_perl->Iorigargv; -#if !NO_TAINT_SUPPORT +#ifndef NO_TAINT_SUPPORT /* Set tainting stuff before PerlIO_debug can possibly get called */ PL_tainting = proto_perl->Itainting; PL_taint_warn = proto_perl->Itaint_warn; @@ -13551,7 +13551,7 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags, PL_timesbuf = proto_perl->Itimesbuf; #endif -#if !NO_TAINT_SUPPORT +#ifndef NO_TAINT_SUPPORT PL_tainted = proto_perl->Itainted; #else PL_tainted = FALSE; @@ -1473,7 +1473,7 @@ attention to precisely which outputs are influenced by which inputs. #define sv_taint(sv) sv_magic((sv), NULL, PERL_MAGIC_taint, NULL, 0) -#if NO_TAINT_SUPPORT +#ifdef NO_TAINT_SUPPORT # define SvTAINTED(sv) 0 #else # define SvTAINTED(sv) (SvMAGICAL(sv) && sv_tainted(sv)) |