diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-07-22 21:11:53 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-07-22 21:11:53 +0200 |
| commit | 613fe7ad2b8e2d4e990cc56596590a23a42c3f7a (patch) | |
| tree | 5527ba540d9e47d1546c7010363427f826ca0a5d | |
| parent | 6ed8069c798827ec4448f37bf2795a08fc9cbd05 (diff) | |
| download | vim-git-613fe7ad2b8e2d4e990cc56596590a23a42c3f7a.tar.gz | |
patch 8.0.0751: OpenPTY missing with some combination of featuresv8.0.0751
Problem: OpenPTY missing with some combination of features. (Kazunobu
Kuriyama)
Solution: Adjust #ifdef. Also include pty.pro when needed.
| -rw-r--r-- | src/misc2.c | 3 | ||||
| -rw-r--r-- | src/proto.h | 11 | ||||
| -rw-r--r-- | src/pty.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/src/misc2.c b/src/misc2.c index 7014e1648..541069e54 100644 --- 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 index b5a6224a9..92e3f6055 100644 --- a/src/proto.h +++ b/src/proto.h @@ -212,15 +212,18 @@ void qsort(void *base, size_t elm_count, size_t elm_size, int (*cmp)(const void # 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 @@ -43,7 +43,7 @@ #include "vim.h" -#if defined(FEAT_GUI) || defined(FEAT_TERMINAL) +#if defined(FEAT_GUI) || defined(FEAT_JOB_CHANNEL) #include <signal.h> diff --git a/src/version.c b/src/version.c index 78a552dd9..174fc0d2e 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 */ /**/ + 751, +/**/ 750, /**/ 749, |