diff options
| -rw-r--r-- | src/if_perl.xs | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/if_perl.xs b/src/if_perl.xs index 9fd219691e..627f437075 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -88,10 +88,8 @@ # endif #endif -/* Perl compatibility stuff. This should ensure compatibility with older - * versions of Perl. - */ - +// Perl compatibility stuff. This should ensure compatibility with older +// versions of Perl. #ifndef PERL_VERSION # include <patchlevel.h> # define PERL_REVISION 5 @@ -99,6 +97,14 @@ # define PERL_SUBVERSION SUBVERSION #endif + +// Work around for ActivePerl 5.20.3+: Avoid generating (g)vim.lib. +#if defined(ACTIVEPERL_VERSION) && (ACTIVEPERL_VERSION >= 2003) \ + && defined(WIN32) && defined(USE_DYNAMIC_LOADING) +# undef XS_EXTERNAL +# define XS_EXTERNAL(name) XSPROTO(name) +#endif + /* * Quoting Jan Dubois of Active State: * ActivePerl build 822 still identifies itself as 5.8.8 but already diff --git a/src/version.c b/src/version.c index bc3cbf3f88..992ed7ffd5 100644 --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 420, +/**/ 419, /**/ 418, |