summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-28 21:21:31 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-28 21:21:31 +0200
commit7f7bd297d6d989254f71c694f1c72d07cbc5c306 (patch)
treec65987887805ab0fc9758f2fcf536560a064ab7b
parent7683aaa5061e26d4bc52fdf40be66789e9e4fec0 (diff)
downloadvim-git-7f7bd297d6d989254f71c694f1c72d07cbc5c306.tar.gz
patch 7.4.2290v7.4.2290
Problem: Compiler warning in tiny build. (Tony Mechelynck) Solution: Add #ifdef around infinity_str().
-rw-r--r--src/message.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/message.c b/src/message.c
index 12cb2c41a..92e735349 100644
--- a/src/message.c
+++ b/src/message.c
@@ -3990,6 +3990,7 @@ tv_float(typval_T *tvs, int *idxp)
# endif
#endif
+#ifdef FEAT_FLOAT
/*
* Return the representation of infinity for printf() function:
* "-inf", "inf", "+inf", " inf", "-INF", "INF", "+INF" or " INF".
@@ -4011,6 +4012,7 @@ infinity_str(int positive,
idx += 4;
return table[idx];
}
+#endif
/*
* This code was included to provide a portable vsnprintf() and snprintf().
diff --git a/src/version.c b/src/version.c
index b67c3f60c..3cae92dde 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2290,
+/**/
2289,
/**/
2288,