patch 8.0.1086: can't build with GTK 3

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

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 51098654967d7087218e6603e86fda7ec973683e..9225375a10f7ce3a13eabad927009d98f61fedcf 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -4942,11 +4942,11 @@ gui_mch_set_shellsize(int width, int height,
 }
 
     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 @@ gui_gtk_get_screen_size_of_win(GtkWidget *win, int *width, int *height)
 #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);

diff --git a/src/version.c b/src/version.c
index cb5963424ca189ce80891376aac62be0351a72c2..d20af56f2ddb8e417635de97c3695827b497f408 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1086,
 /**/
     1085,
 /**/