From 4c8138c20820d5df95c10d5202a2d90c79215895 Mon Sep 17 00:00:00 2001 From: John Peacock Date: Sun, 1 Sep 2002 11:00:12 -0400 Subject: Integrate: [ 17832] Subject: Re: [PATCH] Correct/completes Overloading in XS mods Message-ID: <3D7263BC.9020608@rowman.com> [ 18472] Integrate perlio to mainline: [ 18240] Avoid eqtime() wiping the file (as suggested by "Luis G. Uribe C." [ 18600] Retract the %_/SVf change (part of #18456) for PROTOTYPE (CV) dumping (but now use SvPV_nolen). (This change made an empty prototype to show up as "_" under -Uuseperlio.) p4raw-link: @18600 on //depot/perl: 7f848b6b8b0b3c0ddcfdc59f43b1e261084ffa51 p4raw-link: @18472 on //depot/perl: 636cdfa52826c133f89802fd4f8d0dabbec733b9 p4raw-link: @18240 on //depot/perlio: a6bd83f0a15d2730a2e1d4ba3319cc912869b7f3 p4raw-link: @17832 on //depot/perl: 30d6fba6aa7467c9f9b076801c9a8093e7735500 p4raw-id: //depot/maint-5.8/perl@18882 p4raw-integrated: from //depot/perl@18881 'copy in' pod/perlxs.pod (@17060..) lib/ExtUtils/Command.pm (@17256..) p4raw-integrated: from //depot/perl@18600 'merge in' dump.c (@18558..) p4raw-integrated: from //depot/perl@17832 'merge in' lib/ExtUtils/xsubpp (@15699..) --- dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dump.c') diff --git a/dump.c b/dump.c index cec1c1957c..9f75213344 100644 --- a/dump.c +++ b/dump.c @@ -1291,7 +1291,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo break; case SVt_PVCV: if (SvPOK(sv)) - Perl_dump_indent(aTHX_ level, file, " PROTOTYPE = \"%"SVf"\"\n", sv); + Perl_dump_indent(aTHX_ level, file, " PROTOTYPE = \"%s\"\n", SvPV_nolen(sv)); /* FALL THROUGH */ case SVt_PVFM: do_hv_dump(level, file, " COMP_STASH", CvSTASH(sv)); -- cgit v1.2.1