Move the declaration for more_bodies outside of an #if defined(PERL_IN_SV_C)

It used to be a static function, hence the location, and I failed to spot that
I needed to move it, when I edited it to be non-static.

Problem spotted by Jerry D. Hedden.

3 files changed, 8 insertions, 6 deletions

diff --git a/embed.fnc b/embed.fnc
index c79628dcaf..ac0c892d41 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -1902,9 +1902,6 @@ sn	|char *	|F0convert	|NV nv|NN char *const endbuf|NN STRLEN *const len
 sM	|void	|sv_release_COW	|NN SV *sv|NN const char *pvx|NN SV *after
 #  endif
 s	|SV *	|more_sv
-: Used in sv.c and hv.c
-po	|void *	|more_bodies	|const svtype sv_type|const size_t body_size \
-				|const size_t arena_size
 s	|bool	|sv_2iuv_common	|NN SV *const sv
 s	|void	|glob_assign_glob|NN SV *const dstr|NN SV *const sstr \
 		|const int dtype
@@ -1913,6 +1910,10 @@ sRn	|PTR_TBL_ENT_t *|ptr_table_find|NN PTR_TBL_t *const tbl|NULLOK const void *c
 s	|void	|anonymise_cv_maybe	|NN GV *gv|NN CV *cv
 #endif
 
+: Used in sv.c and hv.c
+po	|void *	|more_bodies	|const svtype sv_type|const size_t body_size \
+				|const size_t arena_size
+
 #if defined(PERL_IN_TOKE_C)
 s	|void	|check_uni
 s	|void	|force_next	|I32 type
diff --git a/embed.h b/embed.h
index 499808be38..9cde4db639 100644
--- a/embed.h
+++ b/embed.h
@@ -1614,8 +1614,6 @@
 #  endif
 #ifdef PERL_CORE
 #define more_sv			S_more_sv
-#endif
-#ifdef PERL_CORE
 #define sv_2iuv_common		S_sv_2iuv_common
 #define glob_assign_glob	S_glob_assign_glob
 #define glob_assign_ref		S_glob_assign_ref
@@ -4076,6 +4074,8 @@
 #define anonymise_cv_maybe(a,b)	S_anonymise_cv_maybe(aTHX_ a,b)
 #endif
 #endif
+#ifdef PERL_CORE
+#endif
 #if defined(PERL_IN_TOKE_C)
 #ifdef PERL_CORE
 #define check_uni()		S_check_uni(aTHX)
diff --git a/proto.h b/proto.h
index 2a9dc57827..034f67344a 100644
--- a/proto.h
+++ b/proto.h
@@ -5881,7 +5881,6 @@ STATIC void	S_sv_release_COW(pTHX_ SV *sv, const char *pvx, SV *after)
 
 #  endif
 STATIC SV *	S_more_sv(pTHX);
-PERL_CALLCONV void *	Perl_more_bodies(pTHX_ const svtype sv_type, const size_t body_size, const size_t arena_size);
 STATIC bool	S_sv_2iuv_common(pTHX_ SV *const sv)
 			__attribute__nonnull__(pTHX_1);
 #define PERL_ARGS_ASSERT_SV_2IUV_COMMON	\
@@ -5913,6 +5912,8 @@ STATIC void	S_anonymise_cv_maybe(pTHX_ GV *gv, CV *cv)
 
 #endif
 
+PERL_CALLCONV void *	Perl_more_bodies(pTHX_ const svtype sv_type, const size_t body_size, const size_t arena_size);
+
 #if defined(PERL_IN_TOKE_C)
 STATIC void	S_check_uni(pTHX);
 STATIC void	S_force_next(pTHX_ I32 type);