From: Nicholas Clark <nick@ccl4.org>
Date: Fri, 21 Dec 2007 07:42:56 +0000 (+0000)
Subject: For 5.12 we can simply exterminate! the private function
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ba235770e5430a2da6b4b3a82416f106fa63406b;p=p5sagit%2Fp5-mst-13.2.git

For 5.12 we can simply exterminate! the private function
Perl_magic_setglob().

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

diff --git a/embed.fnc b/embed.fnc
index bcbb009..fe09c9c 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -466,9 +466,6 @@ p	|int	|magic_setenv	|NN SV* sv|NN MAGIC* mg
 p	|int	|magic_setfm	|NN SV* sv|NN MAGIC* mg
 dp	|int	|magic_sethint	|NN SV* sv|NN MAGIC* mg
 p	|int	|magic_setisa	|NN SV* sv|NN MAGIC* mg
-#ifndef NO_MATHOMS
-p	|int	|magic_setglob	|NN SV* sv|NN MAGIC* mg
-#endif
 p	|int	|magic_setmglob	|NN SV* sv|NN MAGIC* mg
 p	|int	|magic_setnkeys	|NN SV* sv|NN MAGIC* mg
 p	|int	|magic_setpack	|NN SV* sv|NN MAGIC* mg
diff --git a/embed.h b/embed.h
index 996d9dd..10e3ad0 100644
--- a/embed.h
+++ b/embed.h
@@ -438,13 +438,6 @@
 #define magic_setfm		Perl_magic_setfm
 #define magic_sethint		Perl_magic_sethint
 #define magic_setisa		Perl_magic_setisa
-#endif
-#ifndef NO_MATHOMS
-#ifdef PERL_CORE
-#define magic_setglob		Perl_magic_setglob
-#endif
-#endif
-#ifdef PERL_CORE
 #define magic_setmglob		Perl_magic_setmglob
 #define magic_setnkeys		Perl_magic_setnkeys
 #define magic_setpack		Perl_magic_setpack
@@ -2741,13 +2734,6 @@
 #define magic_setfm(a,b)	Perl_magic_setfm(aTHX_ a,b)
 #define magic_sethint(a,b)	Perl_magic_sethint(aTHX_ a,b)
 #define magic_setisa(a,b)	Perl_magic_setisa(aTHX_ a,b)
-#endif
-#ifndef NO_MATHOMS
-#ifdef PERL_CORE
-#define magic_setglob(a,b)	Perl_magic_setglob(aTHX_ a,b)
-#endif
-#endif
-#ifdef PERL_CORE
 #define magic_setmglob(a,b)	Perl_magic_setmglob(aTHX_ a,b)
 #define magic_setnkeys(a,b)	Perl_magic_setnkeys(aTHX_ a,b)
 #define magic_setpack(a,b)	Perl_magic_setpack(aTHX_ a,b)
diff --git a/mathoms.c b/mathoms.c
index 1ea9f34..9e1c546 100644
--- a/mathoms.c
+++ b/mathoms.c
@@ -1318,16 +1318,6 @@ Perl_hv_delete(pTHX_ HV *hv, const char *key, I32 klen_i32, I32 flags)
 }
 
 /* Functions after here were made mathoms post 5.10.0 but pre 5.8.9 */
-int
-Perl_magic_setglob(pTHX_ SV *sv, MAGIC *mg)
-{
-    PERL_UNUSED_ARG(mg);
-    PERL_UNUSED_ARG(sv);
-
-    Perl_croak(aTHX_ "Perl_magic_setglob is dead code?");
-
-    return 0;
-}
 
 AV *
 Perl_newAV(pTHX)
diff --git a/proto.h b/proto.h
index 574fcc8..aa4d42a 100644
--- a/proto.h
+++ b/proto.h
@@ -1226,12 +1226,6 @@ PERL_CALLCONV int	Perl_magic_setisa(pTHX_ SV* sv, MAGIC* mg)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
 
-#ifndef NO_MATHOMS
-PERL_CALLCONV int	Perl_magic_setglob(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
-
-#endif
 PERL_CALLCONV int	Perl_magic_setmglob(pTHX_ SV* sv, MAGIC* mg)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);