As Perl_magic_setbm() and Perl_magic_setfm() aren't in the public API,

they can just go.

p4raw-id: //depot/perl@32790

diff --git a/embed.fnc b/embed.fnc
index bba2c1b..bcce9a5 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -459,10 +459,6 @@ p  |int    |magic_set      |NN SV* sv|NN MAGIC* mg
 p      |int    |magic_setamagic|NN SV* sv|NN MAGIC* mg
 p      |int    |magic_setarylen|NN SV* sv|NN MAGIC* mg
 p      |int    |magic_freearylen_p|NN SV* sv|NN MAGIC* mg
-#ifndef NO_MATHOMS
-p      |int    |magic_setbm    |NN SV* sv|NN MAGIC* mg
-p      |int    |magic_setfm    |NN SV* sv|NN MAGIC* mg
-#endif
 p      |int    |magic_setdbline|NN SV* sv|NN MAGIC* mg
 p      |int    |magic_setdefelem|NN SV* sv|NN MAGIC* mg
 p      |int    |magic_setenv   |NN SV* sv|NN MAGIC* mg

diff --git a/embed.h b/embed.h
index 942199a..ed58cc1 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -431,14 +431,6 @@
 #define magic_setamagic                Perl_magic_setamagic
 #define magic_setarylen                Perl_magic_setarylen
 #define magic_freearylen_p     Perl_magic_freearylen_p
-#endif
-#ifndef NO_MATHOMS
-#ifdef PERL_CORE
-#define magic_setbm            Perl_magic_setbm
-#define magic_setfm            Perl_magic_setfm
-#endif
-#endif
-#ifdef PERL_CORE
 #define magic_setdbline                Perl_magic_setdbline
 #define magic_setdefelem       Perl_magic_setdefelem
 #define magic_setenv           Perl_magic_setenv
@@ -2733,14 +2725,6 @@
 #define magic_setamagic(a,b)   Perl_magic_setamagic(aTHX_ a,b)
 #define magic_setarylen(a,b)   Perl_magic_setarylen(aTHX_ a,b)
 #define magic_freearylen_p(a,b)        Perl_magic_freearylen_p(aTHX_ a,b)
-#endif
-#ifndef NO_MATHOMS
-#ifdef PERL_CORE
-#define magic_setbm(a,b)       Perl_magic_setbm(aTHX_ a,b)
-#define magic_setfm(a,b)       Perl_magic_setfm(aTHX_ a,b)
-#endif
-#endif
-#ifdef PERL_CORE
 #define magic_setdbline(a,b)   Perl_magic_setdbline(aTHX_ a,b)
 #define magic_setdefelem(a,b)  Perl_magic_setdefelem(aTHX_ a,b)
 #define magic_setenv(a,b)      Perl_magic_setenv(aTHX_ a,b)

diff --git a/mathoms.c b/mathoms.c
index ff4a2a0..9e1c546 100644 (file)
--- a/mathoms.c
+++ b/mathoms.c
@@ -1338,18 +1338,6 @@ Perl_newHV(pTHX)
     return hv;
 }
 
-int
-Perl_magic_setbm(pTHX_ SV *sv, MAGIC *mg)
-{
-    return Perl_magic_setregexp(aTHX_ sv, mg);
-}
-
-int
-Perl_magic_setfm(pTHX_ SV *sv, MAGIC *mg)
-{
-    return Perl_magic_setregexp(aTHX_ sv, mg);
-}
-
 #endif /* NO_MATHOMS */
 
 /*

diff --git a/proto.h b/proto.h
index 1cff3b3..250d8d5 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -1198,16 +1198,6 @@ PERL_CALLCONV int        Perl_magic_freearylen_p(pTHX_ SV* sv, MAGIC* mg)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2);
 
-#ifndef NO_MATHOMS
-PERL_CALLCONV int      Perl_magic_setbm(pTHX_ SV* sv, MAGIC* mg)
-                       __attribute__nonnull__(pTHX_1)
-                       __attribute__nonnull__(pTHX_2);
-
-PERL_CALLCONV int      Perl_magic_setfm(pTHX_ SV* sv, MAGIC* mg)
-                       __attribute__nonnull__(pTHX_1)
-                       __attribute__nonnull__(pTHX_2);
-
-#endif
 PERL_CALLCONV int      Perl_magic_setdbline(pTHX_ SV* sv, MAGIC* mg)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2);