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 b772a8e..bfbea39 100644
--- a/src/option.h
+++ b/src/option.h
@@ -966,7 +966,7 @@
 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 1098d7f..f1e1cad 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -5072,7 +5072,7 @@
 	    --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 085b2e1..41442ad 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    950,
+/**/
     949,
 /**/
     948,