# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1537532106 -7200
# Node ID d823dfb273c694d8df6eeb3529550597aa32392c
# Parent  5c1d9630bec341fc4bd628cfa6c1779b22dedcce
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)

diff --git a/src/if_perl.xs b/src/if_perl.xs
--- 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
--- 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,