summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-07-04 21:24:34 +0200
committerBram Moolenaar <Bram@vim.org>2019-07-04 21:24:34 +0200
commitb7ed839976120912c8a755fd1b0f67026b4b056f (patch)
treef156b004b3e3159e70771881d46e836ed90561c1 /src
parent48ac671fe5cb5a7c2d5263d2f122e5e903022e30 (diff)
patch 8.1.1633: cannot generate prototypes with X11 but without GUIv8.1.1633
Problem: Cannot generate prototypes with X11 but without GUI. Solution: Include X11/Intrinsic.h.
Diffstat (limited to 'src')
-rw-r--r--src/gui.h6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/gui.h b/src/gui.h
index a16f0986e7..dd1bbdc687 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -29,6 +29,12 @@
# 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>*/
diff --git a/src/version.c b/src/version.c
index 59c3c51228..20bff057c2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1633,
+/**/
1632,
/**/
1631,