summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-08-14 22:08:25 +0200
committerBram Moolenaar <Bram@vim.org>2018-08-14 22:08:25 +0200
commit37b15568c26e669c333903a70422eacc09488f79 (patch)
treea12d206eba1dc6c74dd6030eeb749a7878470cb9
parent167ae42685dcd430800c51ac7339f7f0938a3e70 (diff)
downloadvim-git-37b15568c26e669c333903a70422eacc09488f79.tar.gz
patch 8.1.0287: MAX is not defined everywherev8.1.0287
Problem: MAX is not defined everywhere. Solution: Define MAX where needed.
-rw-r--r--src/ex_getln.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 4af390440..d38fa4b02 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -13,6 +13,10 @@
#include "vim.h"
+#ifndef MAX
+# define MAX(x,y) ((x) > (y) ? (x) : (y))
+#endif
+
/*
* Variables shared between getcmdline(), redrawcmdline() and others.
* These need to be saved when using CTRL-R |, that's why they are in a
diff --git a/src/version.c b/src/version.c
index 23bcbf83e..efc214cab 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 287,
+/**/
286,
/**/
285,