diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-08-05 15:16:32 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-08-05 15:16:32 +0200 |
| commit | d53109886bc9c4fa7a9c9a402c90fe349b2dd7ac (patch) | |
| tree | aa0e109809d08def7cbea5fb4a89d799c6dd6db5 | |
| parent | 8456ea80502d5e0d86309a0051a0cf48df586ed4 (diff) | |
patch 8.0.0866: Solaris also doesn't have MIN and MAXv8.0.0866
Problem: Solaris also doesn't have MIN and MAX.
Solution: Define MIN and MAX whenever they are not defined. (Ozaki Kiichi,
closes #1939)
| -rw-r--r-- | src/terminal.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/terminal.c b/src/terminal.c index cc73f4fb9c..f5cd2e0190 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 bbbdbe38ff..3595c1af57 100644 --- 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, |