From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 5 Aug 2017 13:16:32 +0000 (+0200)
Subject: patch 8.0.0866: Solaris also doesn't have MIN and MAX
X-Git-Tag: v8.0.0866
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d53109886bc9c4fa7a9c9a402c90fe349b2dd7ac;p=vim

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)
---

diff --git a/src/terminal.c b/src/terminal.c
index cc73f4fb9..f5cd2e019 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"
diff --git a/src/version.c b/src/version.c
index bbbdbe38f..3595c1af5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    866,
 /**/
     865,
 /**/