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
index e3c47d6a51a8913a2ed5c0e7847ab426b9a39911..ece5c8af8c9feb023f37eed9eb844f2f3a01fe9b 100644 (file)
--- 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
index 632571dbe17d9f3c794681ea907fcdb55aa0f19d..b0589cf5b3df0d0050ed0cff7b22af2ae905577a 100644 (file)
--- 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
index b37064b8e3de2800a01869220e0836e7334ddbce..44fcfc58a2dfa2bf075da642567adbb318649b8a 100644 (file)
--- 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
index 26604fd135c439c06bad87823e1862b84d18b96a..8f6d26f1f15353d4ef76c5244013d00e9f144c4c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1014,
 /**/
     1013,
 /**/