summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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,