summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-10-07 10:39:55 +0200
committerBram Moolenaar <Bram@vim.org>2015-10-07 10:39:55 +0200
commit094454fa708d3297db744f095cd2b7b155a8b6ad (patch)
tree2ea8a487dd2621214e1e7cb0a48f3bb3de9a9004
parent74b738d414b2895b3365e26ae3b7792eb82ccf47 (diff)
patch 7.4.890v7.4.890
Problem: Build failure when using dynamic python but not python3. Solution: Adjust the #if to also include DYNAMIC_PYTHON3 and UNIX.
-rw-r--r--src/if_python3.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/if_python3.c b/src/if_python3.c
index e1fc5c77d5..a6a655f0a3 100644
--- 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 d3ea2d3ce7..c60bbe6b75 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 890,
+/**/
889,
/**/
888,