# HG changeset patch # User Christian Brabandt # Date 1504092604 -7200 # Node ID d2373927d76db09ed99ffba87061fa6855c19e01 # Parent 70e04b97b0f3b586340e2fbfcbff3cfca7155b70 patch 8.0.1014: old compiler doesn't know uint32_t commit https://github.com/vim/vim/commit/b47a2597e64b4c4f728433ae005cf6ff1d0dd5c1 Author: Bram Moolenaar 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. diff --git a/src/mbyte.c b/src/mbyte.c --- 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); } diff --git a/src/misc1.c b/src/misc1.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; diff --git a/src/proto/mbyte.pro b/src/proto/mbyte.pro --- 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); diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1014, +/**/ 1013, /**/ 1012,