From: Nick Ing-Simmons Date: Sun, 1 Jul 2001 18:54:09 +0000 (+0000) Subject: Quick for for #ifdef mess X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=9ed1afdbc1bed7621d245b873ba48f50bcb0f262;p=p5sagit%2Fp5-mst-13.2.git Quick for for #ifdef mess p4raw-id: //depot/perlio@11063 --- diff --git a/gv.c b/gv.c index bbe8d47..3ac5306 100644 --- a/gv.c +++ b/gv.c @@ -488,7 +488,7 @@ S_require_errno(pTHX_ GV *gv) { HV* stash = gv_stashpvn("Errno",5,FALSE); - if (!stash || !(gv_fetchmethod(stash, "TIEHASH"))) { + if (!stash || !(gv_fetchmethod(stash, "TIEHASH"))) { dSP; PUTBACK; ENTER; @@ -740,7 +740,7 @@ Perl_gv_fetchpv(pTHX_ const char *nambeg, I32 add, I32 sv_type) gv_init(gv, stash, name, len, add & GV_ADDMULTI); gv_init_sv(gv, sv_type); - if (isALPHA(name[0]) && ! (isLEXWARN_on ? ckWARN(WARN_ONCE) + if (isALPHA(name[0]) && ! (isLEXWARN_on ? ckWARN(WARN_ONCE) : (PL_dowarn & G_WARN_ON ) ) ) GvMULTI_on(gv) ; @@ -1359,15 +1359,11 @@ Perl_amagic_call(pTHX_ SV *left, SV *right, int method, int flags) AMT *amtp=NULL, *oamtp=NULL; int off=0, off1, lr=0, assign=AMGf_assign & flags, notfound=0; int postpr = 0, force_cpy = 0, assignshift = assign ? 1 : 0; -#ifdef DEBUGGING int fl=0; HV* stash=NULL; -#endif if (!(AMGf_noleft & flags) && SvAMAGIC(left) && (mg = mg_find((SV*)( -#ifdef DEGUGGING stash= -#endif SvSTASH(SvRV(left))), PERL_MAGIC_overload_table)) && (ocvp = cvp = (AMT_AMAGIC((AMT*)mg->mg_ptr) @@ -1377,9 +1373,7 @@ Perl_amagic_call(pTHX_ SV *left, SV *right, int method, int flags) || (assign && amtp->fallback > AMGfallNEVER && /* fallback to * usual method */ ( -#ifdef DEBUGGING fl = 1, -#endif cv = cvp[off=method])))) { lr = -1; /* Call method for left argument */ } else { @@ -1487,9 +1481,7 @@ Perl_amagic_call(pTHX_ SV *left, SV *right, int method, int flags) if (!cv) goto not_found; } else if (!(AMGf_noright & flags) && SvAMAGIC(right) && (mg = mg_find((SV*)( -#ifdef DEBUGGING stash= -#endif SvSTASH(SvRV(right))), PERL_MAGIC_overload_table)) && (cvp = (AMT_AMAGIC((AMT*)mg->mg_ptr)