diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2015-02-13 12:05:38 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2015-02-16 23:17:38 -0300 |
| commit | 8f31ebc4f7905abbd04e3d888510f65c6d75e2c8 (patch) | |
| tree | ef7375649d4a233285a8856ac57d377f188dee30 /src | |
| parent | 98dca8a827cda02bd0cfff1da2a3ca5a0ab8ed7a (diff) | |
| download | rneovim-8f31ebc4f7905abbd04e3d888510f65c6d75e2c8.tar.gz rneovim-8f31ebc4f7905abbd04e3d888510f65c6d75e2c8.tar.bz2 rneovim-8f31ebc4f7905abbd04e3d888510f65c6d75e2c8.zip | |
macro: Add MAX macro and rename min to MIN
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/map.c | 2 | ||||
| -rw-r--r-- | src/nvim/vim.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/map.c b/src/nvim/map.c index 3f485cb952..31fe8a01ea 100644 --- a/src/nvim/map.c +++ b/src/nvim/map.c @@ -100,7 +100,7 @@ static inline khint_t String_hash(String s) static inline bool String_eq(String a, String b) { - return strncmp(a.data, b.data, min(a.size, b.size)) == 0; + return strncmp(a.data, b.data, MIN(a.size, b.size)) == 0; } 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... |