commit 8696bbaf52cca7c1fcbd5000c83406e462b7dbf4
author Bram Moolenaar <Bram@vim.org> Sat Sep 09 23:00:56 2017 +0200
committer Bram Moolenaar <Bram@vim.org> Sat Sep 09 23:00:56 2017 +0200
tree b526f8daa06451f9483df87b3e506013db8d4b25
parent e09ba7bae5c867f6d3abc184709dd27488318e97

patch 8.0.1086: can't build with GTK 3

Problem:    Can't build with GTK 3.
Solution:   Rename function argument. (Kazunobu Kuriyama)

src/gui_gtk_x11.c

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 5109865..9225375 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -4942,11 +4942,11 @@
 }
 
     void
-gui_gtk_get_screen_size_of_win(GtkWidget *win, int *width, int *height)
+gui_gtk_get_screen_size_of_win(GtkWidget *wid, int *width, int *height)
 {
 #if GTK_CHECK_VERSION(3,22,0)
-    GdkDisplay *dpy = gtk_widget_get_display(win);
-    GdkWindow *win = gtk_widget_get_window(win);
+    GdkDisplay *dpy = gtk_widget_get_display(wid);
+    GdkWindow *win = gtk_widget_get_window(wid);
     GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
     GdkRectangle geometry;
 
@@ -4956,8 +4956,8 @@
 #else
     GdkScreen* screen;
 
-    if (win != NULL && gtk_widget_has_screen(win))
-	screen = gtk_widget_get_screen(win);
+    if (wid != NULL && gtk_widget_has_screen(wid))
+	screen = gtk_widget_get_screen(wid);
     else
 	screen = gdk_screen_get_default();
     *width = gdk_screen_get_width(screen);

src/version.c

diff --git a/src/version.c b/src/version.c
index cb59634..d20af56 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1086,
+/**/
     1085,
 /**/
     1084,