7047959f24
was to test what happened when we did eventually delete these two ports, not to delete them immediately. A subsequent commit will add appropriate deprecation messages. Hat: portmgr PR: ports/165457 Feature safe: yes (actually no, however, this is to preserve POLA)
24 lines
897 B
Text
24 lines
897 B
Text
# http://rt.perl.org/rt3/Public/Bug/Display.html?id=64562
|
|
# Adapted from:
|
|
# http://perl5.git.perl.org/perl.git/commitdiff/ee6d2783b2d78accfac54397826acf5f6e1715e1?hp=5a8cf367090fb5d83d8e8e0ae381a3525a215928
|
|
diff --git a/op.c b/op.c
|
|
index 517f648..89ed522 100644
|
|
--- op.c
|
|
+++ op.c
|
|
@@ -6166,9 +6166,13 @@ Perl_newFORM(pTHX_ I32 floor, OP *o, OP *block)
|
|
const line_t oldline = CopLINE(PL_curcop);
|
|
if (PL_copline != NOLINE)
|
|
CopLINE_set(PL_curcop, PL_copline);
|
|
- Perl_warner(aTHX_ packWARN(WARN_REDEFINE),
|
|
- o ? "Format %"SVf" redefined"
|
|
- : "Format STDOUT redefined", (void*)cSVOPo->op_sv);
|
|
+ if (o) {
|
|
+ Perl_warner(aTHX_ packWARN(WARN_REDEFINE),
|
|
+ "Format %"SVf" redefined", (void*)cSVOPo->op_sv);
|
|
+ } else {
|
|
+ Perl_warner(aTHX_ packWARN(WARN_REDEFINE),
|
|
+ "Format STDOUT redefined");
|
|
+ }
|
|
CopLINE_set(PL_curcop, oldline);
|
|
}
|
|
SvREFCNT_dec(cv);
|