diff options
| -rw-r--r-- | src/if_perl.xs | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/if_perl.xs b/src/if_perl.xs index 312262ae3f..d88c3f3d99 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -46,6 +46,11 @@ # define NO_THREAD_SAFE_LOCALE #endif +#if defined(MSWIN) && defined(DYNAMIC_PERL) +// Work around for warning C4273 (inconsistent DLL linkage). +# define PERL_EXT_RE_BUILD +#endif + #ifdef __GNUC__ # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wunused-variable" @@ -1483,7 +1488,7 @@ vim_IOLayer_init(void) # if (PERL_REVISION == 5) && (PERL_VERSION >= 18) # undef Perl_sv_free2 -void Perl_sv_free2(pTHX_ SV* sv, const U32 refcnt) +void Perl_sv_free2(pTHX_ SV *const sv, const U32 refcnt) { (*dll_Perl_sv_free2)(aTHX_ sv, refcnt); } @@ -1519,7 +1524,7 @@ NV Perl_sv_2nv_flags(pTHX_ SV *const sv, const I32 flags) # ifdef PERL589_OR_LATER # undef Perl_sv_2iv_flags -IV Perl_sv_2iv_flags(pTHX_ SV* sv, I32 flags) +IV Perl_sv_2iv_flags(pTHX_ SV *const sv, const I32 flags) { return (*dll_Perl_sv_2iv_flags)(aTHX_ sv, flags); } diff --git a/src/version.c b/src/version.c index 1dba3bd291..f839c28159 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2047, +/**/ 2046, /**/ 2045, |