# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1502962204 -7200
# Node ID c589ff137f42f1ba1c4b3a2c029ed75e04d8ab51
# Parent  3235ff91288ccb7f4744cfccef9098444cb87f8d
patch 8.0.0950: MS-Windows: wrong #ifdef, compiler warnings

commit https://github.com/vim/vim/commit/ade59630c737026edfaeff2d76985b304a34afb5
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Aug 17 11:22:46 2017 +0200

    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
--- 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
--- 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
--- 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 */
 /**/
+    950,
+/**/
     949,
 /**/
     948,