diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-02-16 14:07:37 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-02-16 14:07:37 +0100 |
| commit | 6902c0eb27a3e4479445badfef31443f2227fe60 (patch) | |
| tree | 6ceaf45f1c7f4eeaf75389dfa8f474c47d361a80 /src | |
| parent | 0a1b17bbec8f71beaab1d58b4c054ab4320f3bb2 (diff) | |
patch 8.1.0931: vtp_working included in GUI build but unusedv8.1.0931
Problem: vtp_working included in GUI build but unused.
Solution: Adjust #ifdefs. (Ken Takata, closes #3971)
Diffstat (limited to 'src')
| -rw-r--r-- | src/os_win32.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index 0680346af0..816c3a59cf 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -186,12 +186,12 @@ static int win32_getattrs(char_u *name); static int win32_setattrs(char_u *name, int attrs); static int win32_set_archive(char_u *name); -static int vtp_working = 0; static int conpty_working = 0; static int conpty_stable = 0; static void vtp_flag_init(); #ifndef FEAT_GUI_W32 +static int vtp_working = 0; static void vtp_init(); static void vtp_exit(); static int vtp_printf(char *format, ...); @@ -7874,14 +7874,14 @@ is_term_win32(void) return T_NAME != NULL && STRCMP(T_NAME, "win32") == 0; } -#endif - int has_vtp_working(void) { return vtp_working; } +#endif + int has_conpty_working(void) { diff --git a/src/version.c b/src/version.c index e2b6f7a611..00c63e53ce 100644 --- a/src/version.c +++ b/src/version.c @@ -784,6 +784,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 931, +/**/ 930, /**/ 929, |