]> granicus.if.org Git - vim/commitdiff
patch 8.1.1633: cannot generate prototypes with X11 but without GUI v8.1.1633
authorBram Moolenaar <Bram@vim.org>
Thu, 4 Jul 2019 19:24:34 +0000 (21:24 +0200)
committerBram Moolenaar <Bram@vim.org>
Thu, 4 Jul 2019 19:24:34 +0000 (21:24 +0200)
Problem:    Cannot generate prototypes with X11 but without GUI.
Solution:   Include X11/Intrinsic.h.

src/gui.h
src/version.c

index a16f0986e71cab91a327b49344b2dbd44389ce9b..dd1bbdc6872cdab44207cab0359a9048efcd0293 100644 (file)
--- a/src/gui.h
+++ b/src/gui.h
 # include <gtk/gtk.h>
 #endif
 
+// Needed when generating prototypes, since FEAT_GUI is always defined then.
+#if defined(FEAT_XCLIPBOARD) && !defined(FEAT_GUI_MOTIF) \
+       && !defined(FEAT_GUI_ATHENA) && !defined(FEAT_GUI_GTK)
+# include <X11/Intrinsic.h>
+#endif
+
 #ifdef FEAT_GUI_MAC
 # include <Types.h>
 /*# include <Memory.h>*/
index 59c3c51228f8aeac0556ad11e4677b5447b7f658..20bff057c21376b16018415c7733a5c5e3901714 100644 (file)
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1633,
 /**/
     1632,
 /**/