summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-03-03 19:51:58 +0100
committerBram Moolenaar <Bram@vim.org>2018-03-03 19:51:58 +0100
commit3767b61ad99fe6ff2cace2dccb5d35331786735f (patch)
tree7ea5081d36b396877ddb3b91c4ffc6ea951af99c
parent658a154cbf2362c49a9797d9b2b9b69f481cd940 (diff)
patch 8.0.1560: build failure without GUI on MS-Windowsv8.0.1560
Problem: Build failure without GUI on MS-Windows. Solution: Adjust #ifdef for vcol2col().
-rw-r--r--src/ui.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ui.c b/src/ui.c
index b758c4f1d0..f89c14525b 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -3246,7 +3246,8 @@ get_fpos_of_mouse(pos_T *mpos)
#if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MAC) \
|| defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MSWIN) \
- || defined(FEAT_GUI_PHOTON) || defined(FEAT_BEVAL) || defined(PROTO)
+ || defined(FEAT_GUI_PHOTON) || defined(FEAT_BEVAL) \
+ || defined(FEAT_TERM_POPUP_MENU) || defined(PROTO)
/*
* Convert a virtual (screen) column to a character column.
* The first column is one.
diff --git a/src/version.c b/src/version.c
index 716b29b4d4..f8777dcfdf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -779,6 +779,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1560,
+/**/
1559,
/**/
1558,