Mercurial > vim
changeset 11737:7791a15353dc v8.0.0751
patch 8.0.0751: OpenPTY missing with some combination of features
commit https://github.com/vim/vim/commit/613fe7ad2b8e2d4e990cc56596590a23a42c3f7a
Author: Bram Moolenaar <Bram@vim.org>
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.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 22 Jul 2017 21:15:04 +0200 |
parents | 6d49a9aa4490 |
children | 1e58b53aa71d |
files | src/misc2.c src/proto.h src/pty.c src/version.c |
diffstat | 4 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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) {
--- 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