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