# HG changeset patch # User Christian Brabandt # Date 1500750904 -7200 # Node ID 7791a15353dc3d9ee481f9184aed41192f227f24 # Parent 6d49a9aa449065b3ac50cd4c1885d25a23ef98d9 patch 8.0.0751: OpenPTY missing with some combination of features commit https://github.com/vim/vim/commit/613fe7ad2b8e2d4e990cc56596590a23a42c3f7a Author: Bram Moolenaar Date: Sat Jul 22 21:11:53 2017 +0200 patch 8.0.0751: OpenPTY missing with some combination of features Problem: OpenPTY missing with some combination of features. (Kazunobu Kuriyama) Solution: Adjust #ifdef. Also include pty.pro when needed. diff --git a/src/misc2.c b/src/misc2.c --- a/src/misc2.c +++ b/src/misc2.c @@ -6050,6 +6050,9 @@ moreenv(void) } # ifdef USE_VIMPTY_GETENV +/* + * Used for mch_getenv() for Mac. + */ char_u * vimpty_getenv(const char_u *string) { diff --git a/src/proto.h b/src/proto.h --- a/src/proto.h +++ b/src/proto.h @@ -212,15 +212,18 @@ void qsort(void *base, size_t elm_count, # include "channel.pro" # endif -# ifdef FEAT_GUI -# include "gui.pro" +# if defined(FEAT_GUI) || defined(FEAT_JOB_CHANNEL) # if defined(UNIX) || defined(MACOS) # include "pty.pro" # endif +# endif + +# ifdef FEAT_GUI +# include "gui.pro" # if !defined(HAVE_SETENV) && !defined(HAVE_PUTENV) && !defined(VMS) -extern int putenv(const char *string); /* from pty.c */ +extern int putenv(const char *string); /* in misc2.c */ # ifdef USE_VIMPTY_GETENV -extern char_u *vimpty_getenv(const char_u *string); /* from pty.c */ +extern char_u *vimpty_getenv(const char_u *string); /* in misc2.c */ # endif # endif # ifdef FEAT_GUI_W32 diff --git a/src/pty.c b/src/pty.c --- a/src/pty.c +++ b/src/pty.c @@ -43,7 +43,7 @@ #include "vim.h" -#if defined(FEAT_GUI) || defined(FEAT_TERMINAL) +#if defined(FEAT_GUI) || defined(FEAT_JOB_CHANNEL) #include diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 751, +/**/ 750, /**/ 749,