diff options
| -rw-r--r-- | scripts/msgpack-gen.lua | 2 | ||||
| -rw-r--r-- | src/nvim/map.c | 2 | ||||
| -rw-r--r-- | src/nvim/vim.h | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/scripts/msgpack-gen.lua b/scripts/msgpack-gen.lua index d31a062a68..9ff9b4cf6f 100644 --- a/scripts/msgpack-gen.lua +++ b/scripts/msgpack-gen.lua @@ -287,7 +287,7 @@ MsgpackRpcRequestHandler msgpack_rpc_get_handler_for(const char *name, { String m = { .data=(char *)name, - .size=min(name_len, ]]..max_fname_len..[[) + .size=MIN(name_len, ]]..max_fname_len..[[) }; MsgpackRpcRequestHandler rv = map_get(String, MsgpackRpcRequestHandler)(methods, m); 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... |