Fix the build for -Dmad - f0e3f042f14b829f missed a couple of things.

diff --git a/dump.c b/dump.c
index 497049a..f5f42ee 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -2222,7 +2222,7 @@ Perl_xmldump_all_perl(pTHX_ bool justperl)
     PerlIO_setlinebuf(PL_xmlfp);
     if (PL_main_root)
        op_xmldump(PL_main_root);
-    xmldump_packsubs_perl(PL_defstash, justperl)
+    xmldump_packsubs_perl(PL_defstash, justperl);
     if (PL_xmlfp != (PerlIO*)PerlIO_stdout())
        PerlIO_close(PL_xmlfp);
     PL_xmlfp = 0;
@@ -2231,6 +2231,12 @@ Perl_xmldump_all_perl(pTHX_ bool justperl)
 void
 Perl_xmldump_packsubs(pTHX_ const HV *stash)
 {
+    xmldump_packsubs_perl(stash, FALSE);
+}
+
+void
+Perl_xmldump_packsubs_perl(pTHX_ const HV *stash, bool justperl)
+{
     I32        i;
     HE *entry;
 
@@ -2245,12 +2251,12 @@ Perl_xmldump_packsubs(pTHX_ const HV *stash)
            if (SvTYPE(gv) != SVt_PVGV || !GvGP(gv))
                continue;
            if (GvCVu(gv))
-               xmldump_sub(gv);
+               xmldump_sub_perl(gv, justperl);
            if (GvFORM(gv))
                xmldump_form(gv);
            if (HeKEY(entry)[HeKLEN(entry)-1] == ':'
                && (hv = GvHV(gv)) && hv != PL_defstash)
-               xmldump_packsubs(hv);           /* nested package */
+               xmldump_packsubs_perl(hv, justperl);    /* nested package */
        }
     }
 }

diff --git a/embed.fnc b/embed.fnc
index ee4ab7d..952921b 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -2137,7 +2137,7 @@ p |void   |xmldump_all_perl       |bool justperl
 Mp     |void   |xmldump_packsubs       |NN const HV* stash
 p      |void   |xmldump_packsubs_perl  |NN const HV* stash|bool justperl
 Mp     |void   |xmldump_sub    |NN const GV* gv
-M      |void   |xmldump_sub_perl       |NN const GV* gv|bool justperl
+Mp     |void   |xmldump_sub_perl       |NN const GV* gv|bool justperl
 Mp     |void   |xmldump_form   |NN const GV* gv
 Mp     |void   |xmldump_eval
 Mp     |char*  |sv_catxmlsv    |NN SV *dsv|NN SV *ssv

diff --git a/embed.h b/embed.h
index 7410dd1..5ac4f99 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -1917,8 +1917,7 @@
 #define xmldump_packsubs       Perl_xmldump_packsubs
 #define xmldump_packsubs_perl  Perl_xmldump_packsubs_perl
 #define xmldump_sub            Perl_xmldump_sub
-#endif
-#ifdef PERL_CORE
+#define xmldump_sub_perl       Perl_xmldump_sub_perl
 #define xmldump_form           Perl_xmldump_form
 #define xmldump_eval           Perl_xmldump_eval
 #define sv_catxmlsv            Perl_sv_catxmlsv
@@ -4276,7 +4275,7 @@
 #define xmldump_packsubs(a)    Perl_xmldump_packsubs(aTHX_ a)
 #define xmldump_packsubs_perl(a,b)     Perl_xmldump_packsubs_perl(aTHX_ a,b)
 #define xmldump_sub(a)         Perl_xmldump_sub(aTHX_ a)
-#define xmldump_sub_perl(a,b)  _ a,b)
+#define xmldump_sub_perl(a,b)  Perl_xmldump_sub_perl(aTHX_ a,b)
 #define xmldump_form(a)                Perl_xmldump_form(aTHX_ a)
 #define xmldump_eval()         Perl_xmldump_eval(aTHX)
 #define sv_catxmlsv(a,b)       Perl_sv_catxmlsv(aTHX_ a,b)

diff --git a/proto.h b/proto.h
index 6c7498e..3f21420 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -6457,7 +6457,7 @@ PERL_CALLCONV void        Perl_xmldump_sub(pTHX_ const GV* gv)
 #define PERL_ARGS_ASSERT_XMLDUMP_SUB   \
        assert(gv)
 
-PERL_CALLCONV void     xmldump_sub_perl(pTHX_ const GV* gv, bool justperl)
+PERL_CALLCONV void     Perl_xmldump_sub_perl(pTHX_ const GV* gv, bool justperl)
                        __attribute__nonnull__(pTHX_1);
 #define PERL_ARGS_ASSERT_XMLDUMP_SUB_PERL      \
        assert(gv)