summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-10-21 12:38:00 +0200
committerBram Moolenaar <Bram@vim.org>2020-10-21 12:38:00 +0200
commit3da855c8e28140d9f02b1572e445f8d4f977cf64 (patch)
tree65db7aaf13d4d125abbb54141174deacb1bb5c95
parentb53e13a91ab2fc9d52bd044715daa84972f4ce47 (diff)
downloadvim-git-3da855c8e28140d9f02b1572e445f8d4f977cf64.tar.gz
patch 8.2.1875: warning when building GTK guiv8.2.1875
Problem: Warning when building GTK gui. Solution: Add missing function parameter.
-rw-r--r--src/gui_gtk_f.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gui_gtk_f.c b/src/gui_gtk_f.c
index 2a9e5a087..4d0290cb6 100644
--- a/src/gui_gtk_f.c
+++ b/src/gui_gtk_f.c
@@ -51,7 +51,7 @@ struct _GtkFormChild
static void gtk_form_class_init(GtkFormClass *klass);
-static void gtk_form_init(GtkForm *form);
+static void gtk_form_init(GtkForm *form, void *g_class);
static void gtk_form_realize(GtkWidget *widget);
static void gtk_form_unrealize(GtkWidget *widget);
@@ -270,7 +270,7 @@ gtk_form_class_init(GtkFormClass *klass)
}
static void
-gtk_form_init(GtkForm *form)
+gtk_form_init(GtkForm *form, void *g_class UNUSED)
{
#if GTK_CHECK_VERSION(3,0,0)
gtk_widget_set_has_window(GTK_WIDGET(form), TRUE);
diff --git a/src/version.c b/src/version.c
index 2b02d486a..8e5c08f5b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1875,
+/**/
1874,
/**/
1873,