Integrate:

[ 25101]
Subject: Re: janitorial work ? [patch]
Message-ID: <42CC3CE9.5050606@divsol.com>

(reverted all dual-lived modules since they must work with older
perls too so must wait for a new Devel::PPPort)

[ 25116]
Change New*() to Newx*() in various comments and documentation

[ 25117]
Fix worrying typo in handy.h :-s

[ 25196]
Fix Newz() backwards-compatibility macro
p4raw-link: @25196 on //depot/perl: 4541904d5c57838fc76e9cabcf94ba24cec42568
p4raw-link: @25117 on //depot/perl: aab6a430482496c41403384de333f8bf760ce700
p4raw-link: @25116 on //depot/perl: 9f653bb54868b8547466924d4ce483acb8987efb
p4raw-link: @25101 on //depot/perl: a02a5408b2f199007c4dcb74559cc79066307ada

p4raw-id: //depot/maint-5.8/perl@25572
p4raw-integrated: from //depot/perl@25569 'copy in' vmesa/vmesa.c
	(@7984..) ext/DynaLoader/dl_vms.xs (@12638..)
	ext/DynaLoader/dl_next.xs (@12954..) djgpp/djgpp.c (@15378..)
	pod/perlclib.pod (@16688..) ext/XS/Typemap/Typemap.xs
	(@17492..) os2/OS2/REXX/REXX.xs (@21620..) os2/os2.c (@22032..)
	ext/ODBM_File/ODBM_File.xs (@22258..) ext/Socket/Socket.xs
	(@22521..) cygwin/cygwin.c (@24710..) ext/B/C/C.xs (@24734..)
	'merge in' ext/DynaLoader/dl_aix.xs (@18030..)
	ext/File/Glob/bsd_glob.c (@24175..) win32/win32sck.c (@24242..)
	ext/B/B/C.pm (@24531..) ext/ByteLoader/byterun.c (@24573..)
	reentr.c (@24775..) av.c (@24919..) NetWare/nw5.c
	win32/perlhost.h wince/perlhost.h wince/wince.c (@24974..)
	pp_sort.c (@25042..) locale.c (@25045..) reentr.pl (@25084..)
	scope.c (@25094..)
p4raw-integrated: from //depot/perl@25196 'edit in' handy.h (@25191..)
p4raw-integrated: from //depot/perl@25116 'edit in' sv.c (@25113..)
	'merge in' pod/perlguts.pod (@24942..)
p4raw-edited: from //depot/perl@25101 'edit in' hv.c (@25079..)
p4raw-integrated: from //depot/perl@25101 'copy in'
	ext/Devel/DProf/DProf.xs (@24670..) 'edit in'
	ext/ByteLoader/bytecode.h (@24621..) pp_pack.c (@24965..)
	regexec.c (@24997..) perl.c regcomp.c (@25045..) 'merge in'
	op.h (@24526..) bytecode.pl (@24573..) vms/vms.c (@24613..)
	ext/Opcode/Opcode.xs (@24670..) ext/POSIX/POSIX.xs (@24828..)
	op.c (@24901..) doop.c (@24913..) pod/perlapi.pod (@24945..)
	perlio.c (@24965..) pp.c (@25012..) dump.c (@25019..)
	win32/win32.c (@25033..) doio.c (@25045..) gv.c toke.c util.c
	(@25067..) pp_sys.c (@25087..) pp_ctl.c (@25088..) utf8.c
	(@25095..)

1 files changed, 1 insertions, 1 deletions

diff --git a/locale.c b/locale.c
index 8cd8ac478b..bcc13af7cb 100644
--- a/locale.c
+++ b/locale.c
@@ -568,7 +568,7 @@ Perl_mem_collxfrm(pTHX_ const char *s, STRLEN len, STRLEN *xlen)
     /* the +1 is for the terminating NUL. */
 
     xAlloc = sizeof(PL_collation_ix) + PL_collxfrm_base + (PL_collxfrm_mult * len) + 1;
-    New(171, xbuf, xAlloc, char);
+    Newx(xbuf, xAlloc, char);
     if (! xbuf)
 	goto bad;