Skip to content

Commit

Permalink
patch 8.0.1014: old compiler doesn't know uint32_t
Browse files Browse the repository at this point in the history
Problem:    Old compiler doesn't know uint32_t. Warning for using NULL instead
            of NUL.
Solution:   Use UINT32_T.  Use NUL instead of NULL.
  • Loading branch information
brammool committed Aug 30, 2017
1 parent e561a7e commit b47a259
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/mbyte.c
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1400,7 +1400,7 @@ static struct interval ambiguous[] =
* utf_char2cells() with different argument type for libvterm. * utf_char2cells() with different argument type for libvterm.
*/ */
int int
utf_uint2cells(uint32_t c) utf_uint2cells(UINT32_T c)
{ {
return utf_char2cells((int)c); return utf_char2cells((int)c);
} }
Expand Down Expand Up @@ -2312,7 +2312,7 @@ utf_char2bytes(int c, char_u *buf)
* utf_iscomposing() with different argument type for libvterm. * utf_iscomposing() with different argument type for libvterm.
*/ */
int int
utf_iscomposing_uint(uint32_t c) utf_iscomposing_uint(UINT32_T c)
{ {
return utf_iscomposing((int)c); return utf_iscomposing((int)c);
} }
Expand Down
2 changes: 1 addition & 1 deletion src/misc1.c
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3757,7 +3757,7 @@ init_homedir(void)
* platforms, $HOMEDRIVE and $HOMEPATH are automatically defined for * platforms, $HOMEDRIVE and $HOMEPATH are automatically defined for
* each user. Try constructing $HOME from these. * each user. Try constructing $HOME from these.
*/ */
if (var == NULL || *var == NULL) if (var == NULL || *var == NUL)
{ {
char_u *homedrive, *homepath; char_u *homedrive, *homepath;


Expand Down
4 changes: 2 additions & 2 deletions src/proto/mbyte.pro
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ int latin_char2len(int c);
int latin_char2bytes(int c, char_u *buf); int latin_char2bytes(int c, char_u *buf);
int latin_ptr2len(char_u *p); int latin_ptr2len(char_u *p);
int latin_ptr2len_len(char_u *p, int size); 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 utf_char2cells(int c);
int latin_ptr2cells(char_u *p); int latin_ptr2cells(char_u *p);
int utf_ptr2cells(char_u *p); int utf_ptr2cells(char_u *p);
Expand Down Expand Up @@ -38,7 +38,7 @@ int utfc_ptr2len(char_u *p);
int utfc_ptr2len_len(char_u *p, int size); int utfc_ptr2len_len(char_u *p, int size);
int utf_char2len(int c); int utf_char2len(int c);
int utf_char2bytes(int c, char_u *buf); 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_iscomposing(int c);
int utf_printable(int c); int utf_printable(int c);
int utf_class(int c); int utf_class(int c);
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -769,6 +769,8 @@ static char *(features[]) =


static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1014,
/**/ /**/
1013, 1013,
/**/ /**/
Expand Down

0 comments on commit b47a259

Please sign in to comment.