Permalink
Browse files

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.
  • Loading branch information...
brammool committed Jul 22, 2017
1 parent 6ed8069 commit 613fe7ad2b8e2d4e990cc56596590a23a42c3f7a
Showing with 13 additions and 5 deletions.
  1. +3 −0 src/misc2.c
  2. +7 −4 src/proto.h
  3. +1 −1 src/pty.c
  4. +2 −0 src/version.c
View
@@ -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
@@ -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
@@ -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
@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
751,
/**/
750,
/**/

0 comments on commit 613fe7a

Please sign in to comment.