Mercurial > vim

changeset 17268:00cd8830bab9 v8.1.1633

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1633: cannot generate prototypes with X11 but without GUI commit https://github.com/vim/vim/commit/b7ed839976120912c8a755fd1b0f67026b4b056f Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jul 4 21:24:34 2019 +0200 patch 8.1.1633: cannot generate prototypes with X11 but without GUI Problem: Cannot generate prototypes with X11 but without GUI. Solution: Include X11/Intrinsic.h.
author Bram Moolenaar <Bram@vim.org>
date Thu, 04 Jul 2019 21:30:05 +0200
parents 9514db044a1e
children d70705e7bed5
files src/gui.h src/version.c
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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>*/
--- 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,