diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 2000-07-11 18:43:26 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 2000-07-11 18:43:26 +0000 |
| commit | 036b4402dc24284de44ae733b52896d6fd4fbb77 (patch) | |
| tree | d5e9e3da35cb3d3e73042376fa1e177e1605d2ae /sv.c | |
| parent | 5e8d048a952c2fb1d246a3acf32bd1f15a6358fa (diff) | |
| download | perl-036b4402dc24284de44ae733b52896d6fd4fbb77.tar.gz | |
integrate cfgperl changes#6252..6260 into mainline
p4raw-link: @6260 on //depot/cfgperl: fc865a0069737312ca5ef9762fe8a9be7aa37747
p4raw-link: @6252 on //depot/cfgperl: 0e4dedf1581344244dfa297db1d00c01c5f821aa
p4raw-id: //depot/perl@6362
p4raw-integrated: from //depot/cfgperl@6361 'copy in'
t/pragma/constant.t (@5717..) t/op/pack.t t/pragma/warn/op
(@5996..) pp_proto.h (@6243..) t/op/my_stash.t (@6250..)
lib/IPC/Open3.pm (@6253..) 'ignore' t/pragma/warn/regcomp
(@6241..) lib/Exporter.pm (@6251..)
p4raw-integrated: from //depot/cfgperl@6260 'copy in' pp.c (@6217..)
pod/perlfunc.pod (@6248..)
p4raw-integrated: from //depot/cfgperl@6259 'copy in' MANIFEST
(@6250..)
p4raw-integrated: from //depot/cfgperl@6257 'copy in' op.c (@6228..)
'merge in' sv.c (@6244..)
p4raw-integrated: from //depot/cfgperl@6256 'copy in' doop.c (@6254..)
p4raw-integrated: from //depot/cfgperl@6254 'copy in' t/op/tr.t
(@6192..) 'ignore' embedvar.h objXSUB.h (@6243..) 'merge in'
embed.h (@6243..) embed.pl proto.h (@6250..)
Diffstat (limited to 'sv.c')
| -rw-r--r-- | sv.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2768,7 +2768,7 @@ Perl_sv_setsv(pTHX_ SV *dstr, register SV *sstr) if(const_sv) const_changed = sv_cmp(const_sv, op_const_sv(CvSTART((CV*)sref), - Nullcv)); + (CV*)sref)); /* ahem, death to those who redefine * active sort subs */ if (PL_curstackinfo->si_type == PERLSI_SORT && @@ -2776,7 +2776,7 @@ Perl_sv_setsv(pTHX_ SV *dstr, register SV *sstr) Perl_croak(aTHX_ "Can't redefine active sort subroutine %s", GvENAME((GV*)dstr)); - if ((const_changed || const_sv) && ckWARN(WARN_REDEFINE)) + if ((const_changed && const_sv) || ckWARN(WARN_REDEFINE)) Perl_warner(aTHX_ WARN_REDEFINE, const_sv ? "Constant subroutine %s redefined" : "Subroutine %s redefined", |