summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-11-19 20:13:05 +0100
committerBram Moolenaar <Bram@vim.org>2017-11-19 20:13:05 +0100
commit669a828cdc1f019e7abda0e5e9b223d7897f06a8 (patch)
tree16601aabeea02b3d302fdf499bd4a1a890ee3d4c /src
parent246fe03d154c09070d5b7365b7f61716c4e0ddd4 (diff)
downloadvim-git-669a828cdc1f019e7abda0e5e9b223d7897f06a8.tar.gz
patch 8.0.1319: can't build GUI on MS-Windowsv8.0.1319
Problem: Can't build GUI on MS-Windows. Solution: Don't define the balloon_split() function in a GUI-only build.
Diffstat (limited to 'src')
-rw-r--r--src/evalfunc.c6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 77a4fc2c0..8d288e0dc 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -61,7 +61,9 @@ static void f_atan2(typval_T *argvars, typval_T *rettv);
#endif
#ifdef FEAT_BEVAL
static void f_balloon_show(typval_T *argvars, typval_T *rettv);
+# if defined(FEAT_BEVAL_TERM)
static void f_balloon_split(typval_T *argvars, typval_T *rettv);
+# endif
#endif
static void f_browse(typval_T *argvars, typval_T *rettv);
static void f_browsedir(typval_T *argvars, typval_T *rettv);
@@ -495,7 +497,9 @@ static struct fst
#endif
#ifdef FEAT_BEVAL
{"balloon_show", 1, 1, f_balloon_show},
+# if defined(FEAT_BEVAL_TERM)
{"balloon_split", 1, 1, f_balloon_split},
+# endif
#endif
{"browse", 4, 4, f_browse},
{"browsedir", 2, 2, f_browsedir},
@@ -1424,6 +1428,7 @@ f_balloon_show(typval_T *argvars, typval_T *rettv UNUSED)
}
}
+# if defined(FEAT_BEVAL_TERM)
static void
f_balloon_split(typval_T *argvars, typval_T *rettv UNUSED)
{
@@ -1444,6 +1449,7 @@ f_balloon_split(typval_T *argvars, typval_T *rettv UNUSED)
}
}
}
+# endif
#endif
/*
diff --git a/src/version.c b/src/version.c
index 9896a7715..2e52e806c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1319,
+/**/
1318,
/**/
1317,