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 cc73f4fb9c8d7cb8345e79127717cd9d56f8603d..f5cd2e0190aa16e82b7f95176dbb01d456dc3a43 100644 (file)
--- 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 bbbdbe38fffd5b443113f793537ab6dc8b193ede..3595c1af57555f62092b590a7d2bcd5d107e28b0 100644 (file)
--- 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,
 /**/