patch 8.0.0950: MS-Windows: wrong #ifdef, compiler warnings

Problem:    MS-Windows: wrong #ifdef, compiler warnings for signed/unsigned.
Solution:   Change variable type. Change TERMINAL to FEAT_TERMINAL.

diff --git a/src/option.h b/src/option.h
index b772a8edede3430512dcc2b7f678165a6e12430b..bfbea39e24c341140c837395b8d9a3b7ac281022 100644 (file)
--- a/src/option.h
+++ b/src/option.h
@@ -966,7 +966,7 @@ EXTERN long p_wmh;          /* 'winminheight' */
 EXTERN long    p_wmw;          /* 'winminwidth' */
 EXTERN long    p_wiw;          /* 'winwidth' */
 #endif
-#if defined(WIN3264) && defined(TERMINAL)
+#if defined(WIN3264) && defined(FEAT_TERMINAL)
 EXTERN char_u  *p_winptydll;   /* 'winptydll' */
 #endif
 EXTERN int     p_ws;           /* 'wrapscan' */

diff --git a/src/os_win32.c b/src/os_win32.c
index 1098d7f73e4521937acc35d7fae8754cc6fc5d35..f1e1cad8e3ca9f7ca372cf6d5349e4268c5cb3b4 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -5072,7 +5072,7 @@ make_job_env(garray_T *gap, dict_T *env)
            --todo;
            if (wkey != NULL && wval != NULL)
            {
-               int     n;
+               size_t  n;
                size_t  lkey = wcslen(wkey);
                size_t  lval = wcslen(wval);
 

diff --git a/src/version.c b/src/version.c
index 085b2e1e47de9aaa151bd642fefd3148c7725029..41442adcc2b2e712f9eb307002d10de8ce9ac92e 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 */
+/**/
+    950,
 /**/
     949,
 /**/