Mercurial > vim

changeset 12140:c589ff137f42 v8.0.0950

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Christian Brabandt <cb@256bit.org>
date Thu, 17 Aug 2017 11:30:04 +0200
parents 3235ff91288c
children b50406468e5b
files src/option.h src/os_win32.c src/version.c
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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' */
--- 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);
 
--- 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,