patch 7.4.890

Problem:    Build failure when using dynamic python but not python3.
Solution:   Adjust the #if to also include DYNAMIC_PYTHON3 and UNIX.

diff --git a/src/if_python3.c b/src/if_python3.c
index e1fc5c77d568ff1ada83f2c7b500913de860361d..a6a655f0a304e67169fb965915f824e56af2ea85 100644 (file)
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -828,7 +828,7 @@ python3_end()
     --recurse;
 }
 
-#if (defined(DYNAMIC_PYTHON) && defined(FEAT_PYTHON)) || defined(PROTO)
+#if (defined(DYNAMIC_PYTHON3) && defined(DYNAMIC_PYTHON) && defined(FEAT_PYTHON) && defined(UNIX)) || defined(PROTO)
     int
 python3_loaded()
 {

diff --git a/src/version.c b/src/version.c
index d3ea2d3ce7a9ea88b7ccd22397adf5c8218cb47d..c60bbe6b75e4fa51ef47bec8ee52acba6444209a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    890,
 /**/
     889,
 /**/