Mercurial > vim
changeset 11971:2baa88d64217 v8.0.0866
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)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 05 Aug 2017 15:30:04 +0200 |
parents | 938a1e4f79d2 |
children | 94f8b639760a |
files | src/terminal.c src/version.c |
diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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"