Mercurial > vim
changeset 14816:d823dfb273c6 v8.1.0420
patch 8.1.0420: generating vim.lib when using ActivePerl 5.20.3 or later
commit https://github.com/vim/vim/commit/1f402806b88f4187e17c0105b4604f425f41dd1c
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Sep 21 14:01:27 2018 +0200
patch 8.1.0420: generating vim.lib when using ActivePerl 5.20.3 or later
Problem: Generating vim.lib when using ActivePerl 5.20.3 or later.
Solution: Redefine XS_EXTERNAL(). (Ken Takata, closes https://github.com/vim/vim/issues/3462)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 21 Sep 2018 14:15:06 +0200 |
| parents | 5c1d9630bec3 |
| children | 6d18672ad22e |
| files | src/if_perl.xs src/version.c |
| diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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