4 files changed, 26 insertions, 2 deletions

diff --git a/embed.pl b/embed.pl
index 73fdcaf755..0593f0403a 100755
--- a/embed.pl
+++ b/embed.pl
@@ -1418,9 +1418,9 @@ Afnp	|int	|fprintf_nocontext|PerlIO* stream|const char* fmt|...
 #endif
 p	|void	|cv_ckproto	|CV* cv|GV* gv|char* p
 p	|CV*	|cv_clone	|CV* proto
-p	|SV*	|cv_const_sv	|CV* cv
+Ap	|SV*	|cv_const_sv	|CV* cv
 p	|SV*	|op_const_sv	|OP* o|CV* cv
-p	|void	|cv_undef	|CV* cv
+Ap	|void	|cv_undef	|CV* cv
 Ap	|void	|cx_dump	|PERL_CONTEXT* cs
 Ap	|SV*	|filter_add	|filter_t funcp|SV* datasv
 Ap	|void	|filter_del	|filter_t funcp
diff --git a/global.sym b/global.sym
index c9ecd97bad..7a97668caf 100644
--- a/global.sym
+++ b/global.sym
@@ -68,6 +68,8 @@ Perl_sv_setpvf_nocontext
 Perl_sv_catpvf_mg_nocontext
 Perl_sv_setpvf_mg_nocontext
 Perl_fprintf_nocontext
+Perl_cv_const_sv
+Perl_cv_undef
 Perl_cx_dump
 Perl_filter_add
 Perl_filter_del
diff --git a/objXSUB.h b/objXSUB.h
index 4cf78b9694..4e6508f460 100644
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -229,6 +229,14 @@
 #undef  fprintf_nocontext
 #define fprintf_nocontext	Perl_fprintf_nocontext
 #endif
+#undef  Perl_cv_const_sv
+#define Perl_cv_const_sv	pPerl->Perl_cv_const_sv
+#undef  cv_const_sv
+#define cv_const_sv		Perl_cv_const_sv
+#undef  Perl_cv_undef
+#define Perl_cv_undef		pPerl->Perl_cv_undef
+#undef  cv_undef
+#define cv_undef		Perl_cv_undef
 #undef  Perl_cx_dump
 #define Perl_cx_dump		pPerl->Perl_cx_dump
 #undef  cx_dump
diff --git a/perlapi.c b/perlapi.c
index 0294fce397..b396d6bae4 100644
--- a/perlapi.c
+++ b/perlapi.c
@@ -479,6 +479,20 @@ Perl_sv_setpvf_mg_nocontext(SV* sv, const char* pat, ...)
 #undef  Perl_fprintf_nocontext
 #endif
 
+#undef  Perl_cv_const_sv
+SV*
+Perl_cv_const_sv(pTHXo_ CV* cv)
+{
+    return ((CPerlObj*)pPerl)->Perl_cv_const_sv(cv);
+}
+
+#undef  Perl_cv_undef
+void
+Perl_cv_undef(pTHXo_ CV* cv)
+{
+    ((CPerlObj*)pPerl)->Perl_cv_undef(cv);
+}
+
 #undef  Perl_cx_dump
 void
 Perl_cx_dump(pTHXo_ PERL_CONTEXT* cs)