Mercurial > vim
comparison src/proto.h @ 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 | 67cf0d45b006 |
children | 351cf7c67bbe |
comparison
equal
deleted
inserted
replaced
11736:6d49a9aa4490 | 11737:7791a15353dc |
---|---|
210 # endif | 210 # endif |
211 # ifdef FEAT_JOB_CHANNEL | 211 # ifdef FEAT_JOB_CHANNEL |
212 # include "channel.pro" | 212 # include "channel.pro" |
213 # endif | 213 # endif |
214 | 214 |
215 # if defined(FEAT_GUI) || defined(FEAT_JOB_CHANNEL) | |
216 # if defined(UNIX) || defined(MACOS) | |
217 # include "pty.pro" | |
218 # endif | |
219 # endif | |
220 | |
215 # ifdef FEAT_GUI | 221 # ifdef FEAT_GUI |
216 # include "gui.pro" | 222 # include "gui.pro" |
217 # if defined(UNIX) || defined(MACOS) | |
218 # include "pty.pro" | |
219 # endif | |
220 # if !defined(HAVE_SETENV) && !defined(HAVE_PUTENV) && !defined(VMS) | 223 # if !defined(HAVE_SETENV) && !defined(HAVE_PUTENV) && !defined(VMS) |
221 extern int putenv(const char *string); /* from pty.c */ | 224 extern int putenv(const char *string); /* in misc2.c */ |
222 # ifdef USE_VIMPTY_GETENV | 225 # ifdef USE_VIMPTY_GETENV |
223 extern char_u *vimpty_getenv(const char_u *string); /* from pty.c */ | 226 extern char_u *vimpty_getenv(const char_u *string); /* in misc2.c */ |
224 # endif | 227 # endif |
225 # endif | 228 # endif |
226 # ifdef FEAT_GUI_W32 | 229 # ifdef FEAT_GUI_W32 |
227 # include "gui_w32.pro" | 230 # include "gui_w32.pro" |
228 # endif | 231 # endif |