patch 8.0.0750: OpenPTY missing in non-GUI build

Problem:    OpenPTY missing in non-GUI build.
Solution:   Always include pty.c, add an #ifdef to skip over the contents.

diff --git a/src/Makefile b/src/Makefile
index ada3dada2314969499f6d1f99be71c63a1b0e926..dcb92039589bba8974d47da2aeee04576465ba45 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1249,10 +1249,10 @@ LINKIT = @echo >/dev/null
 NONE_INSTALL = install_normal
 
 ### GTK GUI
-GTK_SRC                = gui.c gui_gtk.c gui_gtk_x11.c pty.c gui_gtk_f.c \
+GTK_SRC                = gui.c gui_gtk.c gui_gtk_x11.c gui_gtk_f.c \
                        gui_beval.c $(GRESOURCE_SRC)
 GTK_OBJ                = objects/gui.o objects/gui_gtk.o objects/gui_gtk_x11.o \
-                       objects/pty.o objects/gui_gtk_f.o \
+                       objects/gui_gtk_f.o \
                        objects/gui_beval.o $(GRESOURCE_OBJ)
 GTK_DEFS       = -DFEAT_GUI_GTK $(NARROW_PROTO)
 GTK_IPATH      = $(GUI_INC_LOC)
@@ -1266,10 +1266,10 @@ GTK_TESTTARGET  = gui
 GTK_BUNDLE     =
 
 ### Motif GUI
-MOTIF_SRC      = gui.c gui_motif.c gui_x11.c pty.c gui_beval.c \
+MOTIF_SRC      = gui.c gui_motif.c gui_x11.c gui_beval.c \
                        gui_xmdlg.c gui_xmebw.c
 MOTIF_OBJ      = objects/gui.o objects/gui_motif.o objects/gui_x11.o \
-                       objects/pty.o objects/gui_beval.o \
+                       objects/gui_beval.o \
                        objects/gui_xmdlg.o objects/gui_xmebw.o
 MOTIF_DEFS     = -DFEAT_GUI_MOTIF $(NARROW_PROTO)
 MOTIF_IPATH    = $(GUI_INC_LOC)
@@ -1289,16 +1289,16 @@ XAW_LIB = -lXaw
 
 ### When using Xaw3d, uncomment/comment the following lines to also get the
 ### scrollbars from Xaw3d.
-#ATHENA_SRC    = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c gui_at_fs.c
+#ATHENA_SRC    = gui.c gui_athena.c gui_x11.c gui_beval.c gui_at_fs.c
 #ATHENA_OBJ    = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
-#                      objects/pty.o objects/gui_beval.o objects/gui_at_fs.o
+#                      objects/gui_beval.o objects/gui_at_fs.o
 #ATHENA_DEFS   = -DFEAT_GUI_ATHENA $(NARROW_PROTO) \
 #                  -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
 #                  -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
-ATHENA_SRC     = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c \
+ATHENA_SRC     = gui.c gui_athena.c gui_x11.c gui_beval.c \
                        gui_at_sb.c gui_at_fs.c
 ATHENA_OBJ     = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
-                       objects/pty.o objects/gui_beval.o \
+                       objects/gui_beval.o \
                        objects/gui_at_sb.o objects/gui_at_fs.o
 ATHENA_DEFS    = -DFEAT_GUI_ATHENA $(NARROW_PROTO)
 
@@ -1315,9 +1315,9 @@ ATHENA_BUNDLE     =
 ### neXtaw GUI
 NEXTAW_LIB = -lneXtaw
 
-NEXTAW_SRC     = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c gui_at_fs.c
+NEXTAW_SRC     = gui.c gui_athena.c gui_x11.c gui_beval.c gui_at_fs.c
 NEXTAW_OBJ     = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
-                       objects/pty.o objects/gui_beval.o objects/gui_at_fs.o
+                       objects/gui_beval.o objects/gui_at_fs.o
 NEXTAW_DEFS    = -DFEAT_GUI_ATHENA -DFEAT_GUI_NEXTAW $(NARROW_PROTO)
 
 NEXTAW_IPATH   = $(GUI_INC_LOC)
@@ -1342,8 +1342,8 @@ NEXTAW_BUNDLE     =
 #EXTRA_LIBS = /usr/openwin/lib/libXmu.sa -lm
 
 # PHOTON GUI
-PHOTONGUI_SRC  = gui.c gui_photon.c pty.c
-PHOTONGUI_OBJ  = objects/gui.o objects/gui_photon.o objects/pty.o
+PHOTONGUI_SRC  = gui.c gui_photon.c
+PHOTONGUI_OBJ  = objects/gui.o objects/gui_photon.o
 PHOTONGUI_DEFS = -DFEAT_GUI_PHOTON
 PHOTONGUI_IPATH        =
 PHOTONGUI_LIBS_DIR =
@@ -1357,7 +1357,7 @@ PHOTONGUI_BUNDLE =
 
 # CARBON GUI
 CARBONGUI_SRC  = gui.c gui_mac.c
-CARBONGUI_OBJ  = objects/gui.o objects/gui_mac.o objects/pty.o
+CARBONGUI_OBJ  = objects/gui.o objects/gui_mac.o
 CARBONGUI_DEFS = -DFEAT_GUI_MAC -fno-common -fpascal-strings \
                  -Wall -Wno-unknown-pragmas \
                  -mdynamic-no-pic -pipe
@@ -1374,7 +1374,7 @@ APPDIR = $(VIMNAME).app
 CARBONGUI_TESTARG = VIMPROG=../$(APPDIR)/Contents/MacOS/$(VIMTARGET)
 
 # All GUI files
-ALL_GUI_SRC  = gui.c gui_gtk.c gui_gtk_f.c gui_motif.c gui_xmdlg.c gui_xmebw.c gui_athena.c gui_gtk_x11.c gui_x11.c gui_at_sb.c gui_at_fs.c pty.c
+ALL_GUI_SRC  = gui.c gui_gtk.c gui_gtk_f.c gui_motif.c gui_xmdlg.c gui_xmebw.c gui_athena.c gui_gtk_x11.c gui_x11.c gui_at_sb.c gui_at_fs.c
 ALL_GUI_PRO  = gui.pro gui_gtk.pro gui_motif.pro gui_xmdlg.pro gui_athena.pro gui_gtk_x11.pro gui_x11.pro gui_w32.pro gui_photon.pro
 
 # }}}
@@ -1565,6 +1565,7 @@ BASIC_SRC = \
        os_unix.c \
        auto/pathdef.c \
        popupmnu.c \
+       pty.c \
        quickfix.c \
        regexp.c \
        screen.c \
@@ -1672,6 +1673,7 @@ OBJ_COMMON = \
        objects/os_unix.o \
        objects/pathdef.o \
        objects/popupmnu.o \
+       objects/pty.o \
        objects/quickfix.o \
        objects/regexp.o \
        objects/screen.o \
@@ -3218,12 +3220,12 @@ objects/winclip.o: winclip.c
 objects/pathdef.o: auto/pathdef.c
        $(CCC) -o $@ auto/pathdef.c
 
-objects/pty.o: pty.c
-       $(CCC) -o $@ pty.c
-
 objects/popupmnu.o: popupmnu.c
        $(CCC) -o $@ popupmnu.c
 
+objects/pty.o: pty.c
+       $(CCC) -o $@ pty.c
+
 objects/quickfix.o: quickfix.c
        $(CCC) -o $@ quickfix.c
 

diff --git a/src/pty.c b/src/pty.c
index 20ab65b2a941c5f5ecc6c4d8fc1e50f0bc599e7c..a738ac158d6307ca9a195ac7829531e2ae4a01d2 100644 (file)
--- a/src/pty.c
+++ b/src/pty.c
@@ -43,6 +43,8 @@
 
 #include "vim.h"
 
+#if defined(FEAT_GUI) || defined(FEAT_TERMINAL)
+
 #include <signal.h>
 
 #ifdef __CYGWIN32__
@@ -414,3 +416,5 @@ OpenPTY(char **ttyn)
     return -1;
 }
 #endif
+
+#endif /* FEAT_GUI || FEAT_TERMINAL */

diff --git a/src/version.c b/src/version.c
index 486cd6fd02838cf6681f05c3ab04ee29e11097aa..78a552dd96c03f8052fe060b5c427b2658b2c9b7 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 */
+/**/
+    750,
 /**/
     749,
 /**/