# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1501939804 -7200
# Node ID 2baa88d64217403c33a3a74a76bc49ed734bfcad
# Parent  938a1e4f79d20596c3110aeca83ace6c0e720f89
patch 8.0.0866: Solaris also doesn't have MIN and MAX

commit https://github.com/vim/vim/commit/d53109886bc9c4fa7a9c9a402c90fe349b2dd7ac
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Aug 5 15:16:32 2017 +0200

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    866,
+/**/
     865,
 /**/
     864,