commit d53109886bc9c4fa7a9c9a402c90fe349b2dd7ac
author Bram Moolenaar <Bram@vim.org> Sat Aug 05 15:16:32 2017 +0200
committer Bram Moolenaar <Bram@vim.org> Sat Aug 05 15:16:32 2017 +0200
tree aa0e109809d08def7cbea5fb4a89d799c6dd6db5
parent 8456ea80502d5e0d86309a0051a0cf48df586ed4

patch 8.0.0866: Solaris also doesn't have MIN and MAX

Problem:    Solaris also doesn't have MIN and MAX.
Solution:   Define MIN and MAX whenever they are not defined. (Ozaki Kiichi,
            closes #1939)

src/terminal.c

diff --git a/src/terminal.c b/src/terminal.c
index cc73f4f..f5cd2e0 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -92,9 +92,11 @@
 
 #if defined(FEAT_TERMINAL) || defined(PROTO)
 
-#ifdef WIN3264
-# define MIN(x,y) (x < y ? x : y)
-# define MAX(x,y) (x > y ? x : y)
+#ifndef MIN
+# define MIN(x,y) ((x) < (y) ? (x) : (y))
+#endif
+#ifndef MAX
+# define MAX(x,y) ((x) > (y) ? (x) : (y))
 #endif
 
 #include "libvterm/include/vterm.h"

src/version.c

diff --git a/src/version.c b/src/version.c
index bbbdbe3..3595c1a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    866,
+/**/
     865,
 /**/
     864,