Integrate:

[ 33414]
Subject: [perl #46957] [PATCH] make Devel::Peek::mstat always available
From: srezic@cpan.org (via RT) <perlbug-followup@perl.org>
Date: Sat, 27 Oct 2007 11:33:57 -0700
Message-ID: <rt-3.6.HEAD-4732-1193510037-297.46957-75-0@perl.org>

[ 33416]
Subject: Re: [PATCH] NEXT.pm bug within overloaded stringification
From: Marcel Grünauer <gr@univie.ac.at>
Message-Id: <511B0A54-AB2D-4A65-A02E-E2E07C043EAB@univie.ac.at>
Date: Mon, 3 Mar 2008 16:08:48 +0100

(a resend of <7BBCFD93-91CF-4656-A97F-ED5E749F7B2E@univie.ac.at>)

[ 33434]
Subject: [perl #50538] when( @n && %n ) fails to smart match
From: "brian d foy" (via RT) <perlbug-followup@perl.org>
Date: Mon, 04 Feb 2008 19:36:01 -0800
Message-ID: <rt-3.6.HEAD-4355-1202182561-1550.50538-75-0@perl.org>

Updated tests in ticket to become TODO tests

[ 33439]
Bump VERSION after change #33416
(so we don't end up with different code but same version in
5.10.0 and, say, 5.10.1)

[ 33442]
Better line diagnostics - runlint's caller rather than runlint itself.

[ 33445]
Bring the joy of strict to ext/B/t/lint.t.

[ 33447]
Refactoring the /Can't return (?:array|hash) to scalar context/ croak
logic in pp_rv2av into one place saves 112 bytes here.

[ 33457]
Subject: [PATCH] count-only transliteration needlessly makes copy-on-write 
From: "Yitzchak Scott-Thoennes" <sthoenna@efn.org>
Date: Tue, 4 Mar 2008 16:54:29 -0800 (PST)
Message-ID: <47935.71.32.86.11.1204678469.squirrel@webmail.efn.org>

[ 33458]
Subject: Re: [PATCH] mg_magical() sometimes turns SvRMAGICAL on when it shouldn't
From: Vincent Pit <perl@profvince.com>
Date: Fri, 08 Feb 2008 23:22:19 +0100
Message-ID: <47ACD61B.6030501@profvince.com>

[ 33463]
Silence warning from VC++ following #33447
(not all control paths return a value)

[ 33466]
Subject: [PATCH] MAD update list of failures in mad/t/p55.t
From: Gerard Goossen <gerard@tty.nl>
Date: Mon, 10 Mar 2008 15:17:08 +0100
Message-ID: <20080310141708.GA28994@ostwald>

[ 33467]
Subject: [PATCH] Re: [PATCH] MAD fix p55 $[
From: Gerard Goossen <gerard@tty.nl>
Date: Mon, 10 Mar 2008 15:44:03 +0100
Message-ID: <20080310144403.GC28994@ostwald>

[ 33470]
Subject: Re: [PATCH] make Archive::Extract's x.lzma test file be lzma'd,
From: "Yitzchak Scott-Thoennes" <sthoenna@efn.org>
Date: Tue, 4 Mar 2008 00:28:34 -0800 (PST)
Message-ID: <52329.71.32.86.11.1204619314.squirrel@webmail.efn.org>
p4raw-link: @33470 on //depot/perl: 1842fafe88147d90b1a41de07040f8fdc9d95179
p4raw-link: @33467 on //depot/perl: 27aaedc17a97efc227bf59e642a1a074461e266d
p4raw-link: @33466 on //depot/perl: 58a97135f419acbdcb88dba507c236c50a193268
p4raw-link: @33463 on //depot/perl: 77e217c696c39b67fc6443f86dde2d49211a6302
p4raw-link: @33458 on //depot/perl: 218787bdb7a9250de0cc00118d84dcb23ff2f1c5
p4raw-link: @33457 on //depot/perl: 3788ef8ffa548a64c7425dab843bc6e906dec25c
p4raw-link: @33447 on //depot/perl: 042560a65fd56038b3116f30639cb99d98c48622
p4raw-link: @33445 on //depot/perl: 354c4f6702429b0ee68ace7c068c71c145b01011
p4raw-link: @33442 on //depot/perl: b810cbf3630b54e4370087ac3cf7984f09b3d77c
p4raw-link: @33439 on //depot/perl: 9a35f1ea0522ed94d65ce910c1f49334b567bf08
p4raw-link: @33434 on //depot/perl: 1dcb720a51504d7b20fb1eac689c4efad1376736
p4raw-link: @33416 on //depot/perl: 5dd54fb4257bccaa223fa7d57413e664e9bb3c2c
p4raw-link: @33414 on //depot/perl: 3128eefee559edb9fdd97ad1b3eff48da114045e

p4raw-id: //depot/maint-5.10/perl@33943
p4raw-branched: from //depot/perl@33942 'branch in'
	ext/XS/APItest/t/rmagical.t lib/NEXT/t/stringify.t
p4raw-integrated: from //depot/perl@33942 'copy in' t/op/tr.t
	(@31130..) ext/XS/APItest/APItest.xs (@32699..)
	ext/XS/APItest/APItest.pm (@33023..)
	lib/Archive/Extract/t/src/x.lzma.packed (@33098..)
	ext/B/t/lint.t (@33442..) 'merge in' ext/Devel/Peek/Peek.xs
	(@32703..)
p4raw-integrated: from //depot/perl@33467 'merge in' op.c (@33369..)
p4raw-integrated: from //depot/perl@33466 'ignore' mad/t/p55.t
	(@31554..)
p4raw-integrated: from //depot/perl@33458 'merge in' mg.c (@33291..)
p4raw-integrated: from //depot/perl@33457 'merge in' doop.c (@33291..)
p4raw-integrated: from //depot/perl@33447 'edit in' pp_hot.c (@33376..)
p4raw-integrated: from //depot/perl@33434 'copy in' t/op/switch.t
	(@32120..)
p4raw-integrated: from //depot/perl@33416 'edit in' MANIFEST (@33410..)
	'ignore' lib/NEXT.pm (@25261..)
p4raw-integrated: from //depot/perl@33414 'merge in' malloc.c
	(@33389..)

1 files changed, 4 insertions, 0 deletions

diff --git a/malloc.c b/malloc.c
index 43f5d50da6..1a6efdd4f4 100644
--- a/malloc.c
+++ b/malloc.c
@@ -2445,6 +2445,8 @@ Perl_get_mstats(pTHX_ perl_mstats_t *buf, int buflen, int level)
 		buf->bucket_available_size[i] = BUCKET_SIZE_REAL(i);
 	    }
 	}
+#else /* defined DEBUGGING_MSTATS */
+	PerlIO_printf(Perl_error_log, "perl not compiled with DEBUGGING_MSTATS\n");
 #endif	/* defined DEBUGGING_MSTATS */
 	return 0;		/* XXX unused */
 }
@@ -2516,6 +2518,8 @@ Perl_dump_mstats(pTHX_ char *s)
 		      buffer.total_sbrk, buffer.sbrks, buffer.sbrk_good,
 		      buffer.sbrk_slack, buffer.start_slack,
 		      buffer.total_chain, buffer.sbrked_remains);
+#else /* DEBUGGING_MSTATS */
+	PerlIO_printf(Perl_error_log, "%s: perl not compiled with DEBUGGING_MSTATS\n",s);
 #endif /* DEBUGGING_MSTATS */
 }