diff options
Diffstat (limited to 'src/nvim/vim.h')
| -rw-r--r-- | src/nvim/vim.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/nvim/vim.h b/src/nvim/vim.h index a766d71553..5a89a3c861 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... @@ -289,17 +290,6 @@ enum { # endif #endif -/* We need to call mb_stricmp() even when we aren't dealing with a multi-byte - * encoding because mb_stricmp() takes care of all ascii and non-ascii - * encodings, including characters with umlauts in latin1, etc., while - * STRICMP() only handles the system locale version, which often does not - * handle non-ascii properly. */ - -# define MB_STRICMP(d, s) mb_strnicmp((char_u *)(d), (char_u *)(s), \ - (int)MAXCOL) -# define MB_STRNICMP(d, s, n) mb_strnicmp((char_u *)(d), (char_u *)(s), \ - (int)(n)) - #define STRCAT(d, s) strcat((char *)(d), (char *)(s)) #define STRNCAT(d, s, n) strncat((char *)(d), (char *)(s), (size_t)(n)) |