aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/vim.h
diff options
context:
space:
mode:
authorThiago de Arruda <tpadilha84@gmail.com>2015-02-16 23:42:25 -0300
committerThiago de Arruda <tpadilha84@gmail.com>2015-02-16 23:42:25 -0300
commit0429857689ba98356bc80d01ebd540fe861e8db2 (patch)
treeb4d039dba9e18a041b00cfe31d954931a97241dd /src/nvim/vim.h
parentaf46564dd6e7e709f269f041f749dc312d9c3773 (diff)
parent40b7990553997d9eabb21b746346356016b373c5 (diff)
downloadrneovim-0429857689ba98356bc80d01ebd540fe861e8db2.tar.gz
rneovim-0429857689ba98356bc80d01ebd540fe861e8db2.tar.bz2
rneovim-0429857689ba98356bc80d01ebd540fe861e8db2.zip
Merge PR #1820 'Reimplement builtin terminal UI with termkey/unibilium'
Diffstat (limited to 'src/nvim/vim.h')
-rw-r--r--src/nvim/vim.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/vim.h b/src/nvim/vim.h
index a766d71553..be3f246ff4 100644
--- a/src/nvim/vim.h
+++ b/src/nvim/vim.h
@@ -8,7 +8,8 @@
#ifndef NVIM_VIM_H
# define NVIM_VIM_H
-#define min(X, Y) (X < Y ? X : Y)
+#define MIN(X, Y) (X < Y ? X : Y)
+#define MAX(X, Y) (X > Y ? X : Y)
#include "nvim/types.h"
#include "nvim/pos.h" // for linenr_T, MAXCOL, etc...