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