head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2009.09.11.11.23.31;	author skv;	state dead;
branches;
next	1.1;

1.1
date	2009.06.08.14.35.28;	author skv;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to 5.10.1

Changes:	http://search.cpan.org/~dapm/perl-5.10.1/pod/perl5101delta.pod
@
text
@# 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);
@


1.1
log
@- 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]
@
text
@@

