Mercurial > vim
changeset 12269:d2373927d76d v8.0.1014
patch 8.0.1014: old compiler doesn't know uint32_t
commit https://github.com/vim/vim/commit/b47a2597e64b4c4f728433ae005cf6ff1d0dd5c1
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Aug 30 13:22:28 2017 +0200
patch 8.0.1014: old compiler doesn't know uint32_t
Problem: Old compiler doesn't know uint32_t. Warning for using NULL instead
of NUL.
Solution: Use UINT32_T. Use NUL instead of NULL.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 30 Aug 2017 13:30:04 +0200 |
| parents | 70e04b97b0f3 |
| children | be1ce2f0f7b5 |
| files | src/mbyte.c src/misc1.c src/proto/mbyte.pro src/version.c |
| diffstat | 4 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/mbyte.c +++ b/src/mbyte.c @@ -1400,7 +1400,7 @@ static struct interval ambiguous[] = * utf_char2cells() with different argument type for libvterm. */ int -utf_uint2cells(uint32_t c) +utf_uint2cells(UINT32_T c) { return utf_char2cells((int)c); } @@ -2312,7 +2312,7 @@ utf_char2bytes(int c, char_u *buf) * utf_iscomposing() with different argument type for libvterm. */ int -utf_iscomposing_uint(uint32_t c) +utf_iscomposing_uint(UINT32_T c) { return utf_iscomposing((int)c); }
--- a/src/misc1.c +++ b/src/misc1.c @@ -3757,7 +3757,7 @@ init_homedir(void) * platforms, $HOMEDRIVE and $HOMEPATH are automatically defined for * each user. Try constructing $HOME from these. */ - if (var == NULL || *var == NULL) + if (var == NULL || *var == NUL) { char_u *homedrive, *homepath;
--- a/src/proto/mbyte.pro +++ b/src/proto/mbyte.pro @@ -10,7 +10,7 @@ int latin_char2len(int c); int latin_char2bytes(int c, char_u *buf); int latin_ptr2len(char_u *p); int latin_ptr2len_len(char_u *p, int size); -int utf_uint2cells(uint32_t c); +int utf_uint2cells(UINT32_T c); int utf_char2cells(int c); int latin_ptr2cells(char_u *p); int utf_ptr2cells(char_u *p); @@ -38,7 +38,7 @@ int utfc_ptr2len(char_u *p); int utfc_ptr2len_len(char_u *p, int size); int utf_char2len(int c); int utf_char2bytes(int c, char_u *buf); -int utf_iscomposing_uint(uint32_t c); +int utf_iscomposing_uint(UINT32_T c); int utf_iscomposing(int c); int utf_printable(int c); int utf_class(int c);