|
 |
74af866 |
diff --git a/src/if_perl.xs b/src/if_perl.xs
|
|
|
74af866 |
index c69ed9ef1..2cf78b901 100644
|
|
|
74af866 |
--- a/src/if_perl.xs
|
|
|
74af866 |
+++ b/src/if_perl.xs
|
|
|
74af866 |
@@ -40,7 +40,7 @@
|
|
|
74af866 |
/* Work around for perl-5.18.
|
|
|
74af866 |
* Don't include "perl\lib\CORE\inline.h" for now,
|
|
|
74af866 |
* include it after Perl_sv_free2 is defined. */
|
|
|
74af866 |
-#ifdef DYNAMIC_PERL
|
|
|
74af866 |
+#if (PERL_REVISION == 5) && (PERL_VERSION >= 18)
|
|
|
74af866 |
# define PERL_NO_INLINE_FUNCTIONS
|
|
|
74af866 |
#endif
|
|
|
74af866 |
|
|
|
74af866 |
@@ -402,14 +402,14 @@ static bool (*Perl_sv_2bool)(pTHX_ SV*);
|
|
|
74af866 |
static IV (*Perl_sv_2iv)(pTHX_ SV*);
|
|
|
74af866 |
static SV* (*Perl_sv_2mortal)(pTHX_ SV*);
|
|
|
74af866 |
# if (PERL_REVISION == 5) && (PERL_VERSION >= 8)
|
|
|
74af866 |
-static char* (*Perl_sv_2pv_flags)(pTHX_ SV*, STRLEN*, I32);
|
|
|
74af866 |
+static char* (*Perl_sv_2pv_flags)(pTHX_ SV*, STRLEN* const, const U32);
|
|
|
74af866 |
static char* (*Perl_sv_2pv_nolen)(pTHX_ SV*);
|
|
|
74af866 |
# else
|
|
|
74af866 |
static char* (*Perl_sv_2pv)(pTHX_ SV*, STRLEN*);
|
|
|
74af866 |
# endif
|
|
|
74af866 |
static char* (*Perl_sv_2pvbyte)(pTHX_ SV*, STRLEN*);
|
|
|
74af866 |
# if (PERL_REVISION == 5) && (PERL_VERSION >= 32)
|
|
|
74af866 |
-static char* (*Perl_sv_2pvbyte_flags)(pTHX_ SV*, STRLEN*, I32);
|
|
|
74af866 |
+static char* (*Perl_sv_2pvbyte_flags)(pTHX_ SV*, STRLEN* const, const U32);
|
|
|
74af866 |
# endif
|
|
|
74af866 |
static SV* (*Perl_sv_bless)(pTHX_ SV*, HV*);
|
|
|
74af866 |
# if (PERL_REVISION == 5) && (PERL_VERSION >= 8)
|
|
|
74af866 |
@@ -710,7 +710,7 @@ S_POPMARK(pTHX)
|
|
|
74af866 |
# endif
|
|
|
74af866 |
|
|
|
74af866 |
/* perl-5.34 needs Perl_SvTRUE_common; used in SvTRUE_nomg_NN */
|
|
|
74af866 |
-# if (PERL_REVISION == 5) && (PERL_VERSION >= 34)
|
|
|
74af866 |
+# if (PERL_REVISION == 5) && (PERL_VERSION == 34)
|
|
|
74af866 |
PERL_STATIC_INLINE bool
|
|
|
74af866 |
Perl_SvTRUE_common(pTHX_ SV * sv, const bool sv_2bool_is_fallback)
|
|
|
74af866 |
{
|
|
|
74af866 |
@@ -737,7 +737,7 @@ Perl_SvTRUE_common(pTHX_ SV * sv, const bool sv_2bool_is_fallback)
|
|
|
74af866 |
# endif
|
|
|
74af866 |
|
|
|
74af866 |
/* perl-5.32 needs Perl_SvTRUE */
|
|
|
74af866 |
-# if (PERL_REVISION == 5) && (PERL_VERSION >= 32)
|
|
|
74af866 |
+# if (PERL_REVISION == 5) && (PERL_VERSION == 32)
|
|
|
74af866 |
PERL_STATIC_INLINE bool
|
|
|
74af866 |
Perl_SvTRUE(pTHX_ SV *sv) {
|
|
|
74af866 |
if (!LIKELY(sv))
|