diff options
| author | Eliseo Martínez <eliseomarmol@gmail.com> | 2015-05-07 08:08:31 +0200 |
|---|---|---|
| committer | Eliseo Martínez <eliseomarmol@gmail.com> | 2015-05-07 08:08:31 +0200 |
| commit | f88cec802169d94ad0a19d45746feac5fe2ea0fa (patch) | |
| tree | c87107941de9eab120e21df65e46432921c7aebe /src/nvim/macros.h | |
| parent | a2cf628603bf5948f96ceb90b653d2879a9d2f9e (diff) | |
| parent | 2f60a69bafc4b5130fb213df206179701ec0d74a (diff) | |
| download | rneovim-f88cec802169d94ad0a19d45746feac5fe2ea0fa.tar.gz rneovim-f88cec802169d94ad0a19d45746feac5fe2ea0fa.tar.bz2 rneovim-f88cec802169d94ad0a19d45746feac5fe2ea0fa.zip | |
Merge #2470: Remove char_u (5)
Reviewed-by: Scott Prager <splinterofchaos@gmail.com>
Reviewed-by: Michael Reed <m.reed@mykolab.com>
Reviewed-by: Eliseo Martínez <eliseomarmol@gmail.com>
Diffstat (limited to 'src/nvim/macros.h')
| -rw-r--r-- | src/nvim/macros.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/macros.h b/src/nvim/macros.h index 46f591eb33..51542bd3a7 100644 --- a/src/nvim/macros.h +++ b/src/nvim/macros.h @@ -128,12 +128,12 @@ /* Get the length of the character p points to */ # define MB_PTR2LEN(p) (has_mbyte ? (*mb_ptr2len)(p) : 1) /* Advance multi-byte pointer, skip over composing chars. */ -# define mb_ptr_adv(p) p += has_mbyte ? (*mb_ptr2len)(p) : 1 +# define mb_ptr_adv(p) (p += has_mbyte ? (*mb_ptr2len)((char_u *)p) : 1) /* Advance multi-byte pointer, do not skip over composing chars. */ -# define mb_cptr_adv(p) p += \ - enc_utf8 ? utf_ptr2len(p) : has_mbyte ? (*mb_ptr2len)(p) : 1 +# define mb_cptr_adv(p) (p += \ + enc_utf8 ? utf_ptr2len(p) : has_mbyte ? (*mb_ptr2len)(p) : 1) /* Backup multi-byte pointer. Only use with "p" > "s" ! */ -# define mb_ptr_back(s, p) p -= has_mbyte ? ((*mb_head_off)(s, p - 1) + 1) : 1 +# define mb_ptr_back(s, p) (p -= has_mbyte ? ((*mb_head_off)((char_u *)s, (char_u *)p - 1) + 1) : 1) /* get length of multi-byte char, not including composing chars */ # define mb_cptr2len(p) (enc_utf8 ? utf_ptr2len(p) : (*mb_ptr2len)(p)) |