Skip to content

Commit b47a259

Browse files
committed
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.
1 parent e561a7e commit b47a259

4 files changed

Lines changed: 7 additions & 5 deletions

File tree

src/mbyte.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ static struct interval ambiguous[] =
14001400
* utf_char2cells() with different argument type for libvterm.
14011401
*/
14021402
int
1403-
utf_uint2cells(uint32_t c)
1403+
utf_uint2cells(UINT32_T c)
14041404
{
14051405
return utf_char2cells((int)c);
14061406
}
@@ -2312,7 +2312,7 @@ utf_char2bytes(int c, char_u *buf)
23122312
* utf_iscomposing() with different argument type for libvterm.
23132313
*/
23142314
int
2315-
utf_iscomposing_uint(uint32_t c)
2315+
utf_iscomposing_uint(UINT32_T c)
23162316
{
23172317
return utf_iscomposing((int)c);
23182318
}

src/misc1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3757,7 +3757,7 @@ init_homedir(void)
37573757
* platforms, $HOMEDRIVE and $HOMEPATH are automatically defined for
37583758
* each user. Try constructing $HOME from these.
37593759
*/
3760-
if (var == NULL || *var == NULL)
3760+
if (var == NULL || *var == NUL)
37613761
{
37623762
char_u *homedrive, *homepath;
37633763

src/proto/mbyte.pro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ int latin_char2len(int c);
1010
int latin_char2bytes(int c, char_u *buf);
1111
int latin_ptr2len(char_u *p);
1212
int latin_ptr2len_len(char_u *p, int size);
13-
int utf_uint2cells(uint32_t c);
13+
int utf_uint2cells(UINT32_T c);
1414
int utf_char2cells(int c);
1515
int latin_ptr2cells(char_u *p);
1616
int utf_ptr2cells(char_u *p);
@@ -38,7 +38,7 @@ int utfc_ptr2len(char_u *p);
3838
int utfc_ptr2len_len(char_u *p, int size);
3939
int utf_char2len(int c);
4040
int utf_char2bytes(int c, char_u *buf);
41-
int utf_iscomposing_uint(uint32_t c);
41+
int utf_iscomposing_uint(UINT32_T c);
4242
int utf_iscomposing(int c);
4343
int utf_printable(int c);
4444
int utf_class(int c);

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,8 @@ static char *(features[]) =
769769

770770
static int included_patches[] =
771771
{ /* Add new patch number below this line */
772+
/**/
773+
1014,
772774
/**/
773775
1013,
774776
/**/

0 commit comments

Comments
 (0)