mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 14:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

macro: Add MAX macro and rename min to MIN

Browse Source
This commit is contained in:
Thiago de Arruda
2015-02-13 12:05:38 -03:00
parent 98dca8a827
commit 8f31ebc4f7
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/msgpack-gen.lua
View File

@@ -287,7 +287,7 @@ MsgpackRpcRequestHandler msgpack_rpc_get_handler_for(const char *name,
{ {
String m = { String m = {
.data=(char *)name, .data=(char *)name,
.size=min(name_len, ]]..max_fname_len..[[) .size=MIN(name_len, ]]..max_fname_len..[[)
}; };
MsgpackRpcRequestHandler rv = MsgpackRpcRequestHandler rv =
map_get(String, MsgpackRpcRequestHandler)(methods, m); map_get(String, MsgpackRpcRequestHandler)(methods, m);

2
src/nvim/map.c
View File

@@ -100,7 +100,7 @@ static inline khint_t String_hash(String s)
static inline bool String_eq(String a, String b) 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;
} }

3
src/nvim/vim.h
View File

@@ -8,7 +8,8 @@
#ifndef NVIM_VIM_H #ifndef NVIM_VIM_H
# define 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/types.h"
#include "nvim/pos.h" // for linenr_T, MAXCOL, etc... #include "nvim/pos.h" // for linenr_T, MAXCOL, etc...