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
index 7014e1648df4bbec5c05ff5493bf1910ca30a3f3..541069e54b6ce6bb9cab7164889a743ad74547b5 100644 (file)
--- 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 b5a6224a960a48a438f816366d28e63dff49dede..92e3f605524799c4b11a8386d4e35684c20c81e5 100644 (file)
--- 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

diff --git a/src/pty.c b/src/pty.c
index a738ac158d6307ca9a195ac7829531e2ae4a01d2..9b03612227417e97b0e4be0c06d30c70db59c63b 100644 (file)
--- 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 <signal.h>
 

diff --git a/src/version.c b/src/version.c
index 78a552dd96c03f8052fe060b5c427b2658b2c9b7..174fc0d2e44d27da8217771e92db4d4b63991798 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    751,
 /**/
     750,
 /**/