Change 32684 by [EMAIL PROTECTED] on 2007/12/21 07:42:56
For 5.12 we can simply exterminate! the private function
Perl_magic_setglob().
Affected files ...
... //depot/perl/embed.fnc#543 edit
... //depot/perl/embed.h#730 edit
... //depot/perl/mathoms.c#83 edit
... //depot/perl/proto.h#879 edit
Differences ...
==== //depot/perl/embed.fnc#543 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#542~32680~ 2007-12-20 13:15:57.000000000 -0800
+++ perl/embed.fnc 2007-12-20 23:42:56.000000000 -0800
@@ -466,9 +466,6 @@
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
==== //depot/perl/embed.h#730 (text+w) ====
Index: perl/embed.h
--- perl/embed.h#729~32682~ 2007-12-20 14:22:59.000000000 -0800
+++ perl/embed.h 2007-12-20 23:42:56.000000000 -0800
@@ -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)
==== //depot/perl/mathoms.c#83 (text) ====
Index: perl/mathoms.c
--- perl/mathoms.c#82~32676~ 2007-12-20 12:23:45.000000000 -0800
+++ perl/mathoms.c 2007-12-20 23:42:56.000000000 -0800
@@ -1318,16 +1318,6 @@
}
/* 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)
==== //depot/perl/proto.h#879 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#878~32680~ 2007-12-20 13:15:57.000000000 -0800
+++ perl/proto.h 2007-12-20 23:42:56.000000000 -0800
@@ -1226,12 +1226,6 @@
__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);
End of Patch.
