summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-04-06 17:56:05 +0200
committerBram Moolenaar <Bram@vim.org>2019-04-06 17:56:05 +0200
commit3d3f21764a8003b90216ae6fb988af1dae5f5d70 (patch)
tree0c4f9499d96d2296348bdc4907bf0c868a5bd1e9
parentfa1e90cd4d1bebd66da22df4625f70963f091f17 (diff)
downloadvim-git-3d3f21764a8003b90216ae6fb988af1dae5f5d70.tar.gz
patch 8.1.1126: build failure with +terminal but without tgetentv8.1.1126
Problem: Build failure with +terminal but without tgetent. Solution: Adjust #ifdef.
-rw-r--r--src/ui.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ui.c b/src/ui.c
index 44328521f..f78c570c8 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -628,8 +628,9 @@ ui_new_shellsize(void)
}
#if (defined(FEAT_EVAL) \
- && (defined(FEAT_GUI) \
- || (defined(HAVE_TGETENT) && defined(FEAT_TERMRESPONSE)))) \
+ && (defined(FEAT_GUI) \
+ || (defined(HAVE_TGETENT) && defined(FEAT_TERMRESPONSE)))) \
+ || defined(FEAT_TERMINAL) \
|| defined(PROTO)
/*
* Get the window position in pixels, if possible.
diff --git a/src/version.c b/src/version.c
index f9dd7cc21..9115a0047 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 */
/**/
+ 1126,
+/**/
1125,
/**/
1124,