diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-08-17 11:22:46 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-08-17 11:22:46 +0200 |
| commit | ade59630c737026edfaeff2d76985b304a34afb5 (patch) | |
| tree | 8e6279e22e1e36212ae370c806680c0c1a863b51 | |
| parent | 9e13aa7729486d79a530ecae1a7a95d10da27d61 (diff) | |
patch 8.0.0950: MS-Windows: wrong #ifdef, compiler warningsv8.0.0950
Problem: MS-Windows: wrong #ifdef, compiler warnings for signed/unsigned.
Solution: Change variable type. Change TERMINAL to FEAT_TERMINAL.
| -rw-r--r-- | src/option.h | 2 | ||||
| -rw-r--r-- | src/os_win32.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/option.h b/src/option.h index b772a8eded..bfbea39e24 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 1098d7f73e..f1e1cad8e3 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 085b2e1e47..41442adcc2 100644 --- 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, |