To: vim_dev@googlegroups.com Subject: Patch 8.1.0420 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.0420 Problem: Generating vim.lib when using ActivePerl 5.20.3 or later. Solution: Redefine XS_EXTERNAL(). (Ken Takata, closes #3462) Files: src/if_perl.xs *** ../vim-8.1.0419/src/if_perl.xs 2018-08-02 21:46:47.575548793 +0200 --- src/if_perl.xs 2018-09-21 13:59:48.885177259 +0200 *************** *** 88,97 **** # endif #endif ! /* Perl compatibility stuff. This should ensure compatibility with older ! * versions of Perl. ! */ ! #ifndef PERL_VERSION # include # define PERL_REVISION 5 --- 88,95 ---- # endif #endif ! // Perl compatibility stuff. This should ensure compatibility with older ! // versions of Perl. #ifndef PERL_VERSION # include # define PERL_REVISION 5 *************** *** 99,104 **** --- 97,110 ---- # 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 *** ../vim-8.1.0419/src/version.c 2018-09-21 13:56:21.522830206 +0200 --- src/version.c 2018-09-21 14:00:53.928646015 +0200 *************** *** 796,797 **** --- 796,799 ---- { /* Add new patch number below this line */ + /**/ + 420, /**/ -- From "know your smileys": :-D Big smile /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///