0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

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.
This commit is contained in:
Bram Moolenaar
2017-07-22 21:11:53 +02:00
parent 6ed8069c79
commit 613fe7ad2b
4 changed files with 13 additions and 5 deletions

View File

@@ -6050,6 +6050,9 @@ moreenv(void)
}
# ifdef USE_VIMPTY_GETENV
/*
* Used for mch_getenv() for Mac.
*/
char_u *
vimpty_getenv(const char_u *string)
{

View File

@@ -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

View File

@@ -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>

View File

@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
751,
/**/
750,
/**/