summaryrefslogtreecommitdiff
path: root/lang/perl5.10/files/patch-bug64562
diff options
context:
space:
mode:
authorSergey Skvortsov <skv@FreeBSD.org>2009-06-08 14:35:28 +0000
committerSergey Skvortsov <skv@FreeBSD.org>2009-06-08 14:35:28 +0000
commit42eabd775382a2bb10e1cfa3d850d52c299ec1d8 (patch)
tree64b2d004842f825a8d647d022ccccaaff42b3b52 /lang/perl5.10/files/patch-bug64562
parent- Add PORTSCOUT to ignore false positive new versions (diff)
- Add more essential bugfixes
- Add perl-threaded-5.* to CONFLICTS [1] - Introduce PERL_VENDOR_PREFIX variable - Be really PREFIX-neutral [2} Submitted by: lth [1], rafan [2]
Diffstat (limited to '')
-rw-r--r--lang/perl5.10/files/patch-bug6456223
1 files changed, 23 insertions, 0 deletions
diff --git a/lang/perl5.10/files/patch-bug64562 b/lang/perl5.10/files/patch-bug64562
new file mode 100644
index 000000000000..7503887573e3
--- /dev/null
+++ b/lang/perl5.10/files/patch-bug64562
@@ -0,0 +1,23 @@
+# http://rt.perl.org/rt3/Public/Bug/Display.html?id=64562
+# 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_parser && PL_parser->copline != NOLINE)
+ CopLINE_set(PL_curcop, PL_parser->copline);
+- Perl_warner(aTHX_ packWARN(WARN_REDEFINE),
+- o ? "Format %"SVf" redefined"
+- : "Format STDOUT redefined", SVfARG(cSVOPo->op_sv));
++ if (o) {
++ Perl_warner(aTHX_ packWARN(WARN_REDEFINE),
++ "Format %"SVf" redefined", SVfARG(cSVOPo->op_sv));
++ } else {
++ Perl_warner(aTHX_ packWARN(WARN_REDEFINE),
++ "Format STDOUT redefined");
++ }
+ CopLINE_set(PL_curcop, oldline);
+ }
+ SvREFCNT_dec(cv);