summaryrefslogtreecommitdiff
path: root/src/proto.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-07-22 21:11:53 +0200
committerBram Moolenaar <Bram@vim.org>2017-07-22 21:11:53 +0200
commit613fe7ad2b8e2d4e990cc56596590a23a42c3f7a (patch)
tree5527ba540d9e47d1546c7010363427f826ca0a5d /src/proto.h
parent6ed8069c798827ec4448f37bf2795a08fc9cbd05 (diff)
downloadvim-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.
Diffstat (limited to 'src/proto.h')
-rw-r--r--src/proto.h11
1 files changed, 7 insertions, 4 deletions
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