patch 7.4.890

brammool · brammool · commit 094454fa708d · 2015-10-07T10:39:55.000+02:00
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
@@ -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
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    890,
 /**/
     889,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -828,7 +828,7 @@ python3_end()`
`828`	`828`	`--recurse;`
`829`	`829`	`}`
`830`	`830`
`831`		`-#if (defined(DYNAMIC_PYTHON) && defined(FEAT_PYTHON)) \|\| defined(PROTO)`
	`831`	`+#if (defined(DYNAMIC_PYTHON3) && defined(DYNAMIC_PYTHON) && defined(FEAT_PYTHON) && defined(UNIX)) \|\| defined(PROTO)`
`832`	`832`	`int`
`833`	`833`	`python3_loaded()`
`834`	`834`	`{`