From ade59630c737026edfaeff2d76985b304a34afb5 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 17 Aug 2017 11:22:46 +0200 Subject: 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. --- src/option.h | 2 +- src/os_win32.c | 2 +- src/version.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/option.h b/src/option.h index b772a8ede..bfbea39e2 100644 --- 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 1098d7f73..f1e1cad8e 100644 --- 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 085b2e1e4..41442adcc 100644 --- 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, /**/ -- cgit v1.2.1