From: Andy Lester <andy@petdance.com>
Date: Thu, 11 May 2006 22:41:01 +0000 (-0500)
Subject: Integrate:
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=06dcd5bfe49c573553f3a05b5b5fdf417bf526a2;p=p5sagit%2Fp5-mst-13.2.git

Integrate:
[ 28144]
In Perl_Gv_AMupdate(), there's no need to call sv_unmagic() if we know
the magic isn't there.

[ 28145]
Simplify the non-printable name error reporting code in Perl_allocmy().

[ 28176]
Subject: [PATCH] Speed up utf8.c a bit
Date: Thu, 11 May 2006 22:41:01 -0500
Message-ID: <20060512034101.GA10709@petdance.com>

[ 28178]
The upgrade/croak order in Perl_sv_utf8_encode() seemed utterly
backwards. It now checks for readonly *first*.

[ 28179]
Subject: [PATCH] Proper use of static funcs in toke.c and pp_sys.c
From: andy@petdance.com (Andy Lester)
Date: Tue, 9 May 2006 12:27:30 -0500
Message-ID: <20060509172730.GA5272@petdance.com>

[ 28180]
Subject: [PATCH]  upgrade bytes_to_uni
From: andy@petdance.com (Andy Lester)
Date: Fri, 12 May 2006 00:21:23 -0500
Message-ID: <20060512052123.GA21648@petdance.com>

[ 28194]
Subject: [PATCH] S_reguni should return its length
From: andy@petdance.com (Andy Lester)
Date: Sun, 14 May 2006 09:46:32 -0500
Message-ID: <20060514144632.GA20935@petdance.com>


ooops, and also something in blead that wasn't meant to sneak in:
Change PERL_WARNHOOK_FATAL to &PL_sv_placeholder, rather than some
evil cast relative to NULL.
p4raw-link: @28194 on //depot/perl: 71207a3462fa4c2b33c5608a4362ac40e975ecdb
p4raw-link: @28180 on //depot/perl: 64844641e1be28fdf8b7bba9436537339624f40b
p4raw-link: @28179 on //depot/perl: 931e0695c454f4c18f68d30775151862650cc4d8
p4raw-link: @28178 on //depot/perl: a5f5288a1ce96404c41043e92557b8c1a5ad9e30
p4raw-link: @28176 on //depot/perl: 3ebfea2846d81f58e86dfcb7f9e09300e5dfcd17
p4raw-link: @28145 on //depot/perl: d1544d85966c2f41014a6f408fd81b36501caa7c
p4raw-link: @28144 on //depot/perl: 14899595d82ccba509ac7743655764129ed32177

p4raw-id: //depot/perl@29980
---

diff --git a/warnings.h b/warnings.h
index c8cd9a5..5364a51 100644
--- a/warnings.h
+++ b/warnings.h
@@ -25,7 +25,7 @@
 				 (x) == pWARN_NONE)
 
 /* if PL_warnhook is set to this value, then warnings die */
-#define PERL_WARNHOOK_FATAL	(((SV*)0) + 1)
+#define PERL_WARNHOOK_FATAL	(&PL_sv_placeholder)
 
 /* Warnings Categories added in Perl 5.008 */
 
diff --git a/warnings.pl b/warnings.pl
index 3c978d1..f2380d9 100644
--- a/warnings.pl
+++ b/warnings.pl
@@ -284,7 +284,7 @@ print WARN <<'EOM' ;
 				 (x) == pWARN_NONE)
 
 /* if PL_warnhook is set to this value, then warnings die */
-#define PERL_WARNHOOK_FATAL	(((SV*)0) + 1)
+#define PERL_WARNHOOK_FATAL	(&PL_sv_placeholder)
 EOM
 
 my $offset = 0 ;