Fix compilation errors in netbsd/solaris

These were introduced by 1ef9039bccbfe64f47f201b6cfb7d6d23e0b08a7.  The
compilers in question die if something that is "forced to be inlined'
cannot be.  So, change to merely request inlining.

Also change the order of definition to try to avoid forward references
to make it easier to inline.

1 files changed, 24 insertions, 24 deletions

diff --git a/sv_inline.h b/sv_inline.h
index e0615e4a29..c92bff366a 100644
--- a/sv_inline.h
+++ b/sv_inline.h
@@ -850,6 +850,30 @@ S_sv_or_pv_pos_u2b(pTHX_ SV *sv, const char *pv, STRLEN pos, STRLEN *lenp)
 #endif
 
 PERL_STATIC_INLINE char *
+Perl_sv_pvutf8n_force_wrapper(pTHX_ SV * const sv, STRLEN * const lp, const U32 dummy)
+{
+    /* This is just so can be passed to Perl_SvPV_helper() as a function
+     * pointer with the same signature as all the other such pointers, and
+     * having hence an unused parameter */
+    PERL_ARGS_ASSERT_SV_PVUTF8N_FORCE_WRAPPER;
+    PERL_UNUSED_ARG(dummy);
+
+    return sv_pvutf8n_force(sv, lp);
+}
+
+PERL_STATIC_INLINE char *
+Perl_sv_pvbyten_force_wrapper(pTHX_ SV * const sv, STRLEN * const lp, const U32 dummy)
+{
+    /* This is just so can be passed to Perl_SvPV_helper() as a function
+     * pointer with the same signature as all the other such pointers, and
+     * having hence an unused parameter */
+    PERL_ARGS_ASSERT_SV_PVBYTEN_FORCE_WRAPPER;
+    PERL_UNUSED_ARG(dummy);
+
+    return sv_pvbyten_force(sv, lp);
+}
+
+PERL_STATIC_INLINE char *
 Perl_SvPV_helper(pTHX_
                  SV * const sv,
                  STRLEN * const lp,
@@ -904,30 +928,6 @@ Perl_SvPV_helper(pTHX_
     return non_trivial(aTHX_ sv, lp, (flags|return_flags));
 }
 
-PERL_STATIC_INLINE char *
-Perl_sv_pvutf8n_force_wrapper(pTHX_ SV * const sv, STRLEN * const lp, const U32 dummy)
-{
-    /* This is just so can be passed to Perl_SvPV_helper() as a function
-     * pointer with the same signature as all the other such pointers, and
-     * having hence an unused parameter */
-    PERL_ARGS_ASSERT_SV_PVUTF8N_FORCE_WRAPPER;
-    PERL_UNUSED_ARG(dummy);
-
-    return sv_pvutf8n_force(sv, lp);
-}
-
-PERL_STATIC_INLINE char *
-Perl_sv_pvbyten_force_wrapper(pTHX_ SV * const sv, STRLEN * const lp, const U32 dummy)
-{
-    /* This is just so can be passed to Perl_SvPV_helper() as a function
-     * pointer with the same signature as all the other such pointers, and
-     * having hence an unused parameter */
-    PERL_ARGS_ASSERT_SV_PVBYTEN_FORCE_WRAPPER;
-    PERL_UNUSED_ARG(dummy);
-
-    return sv_pvbyten_force(sv, lp);
-}
-
 /*
  * ex: set ts=8 sts=4 sw=4 et:
  */