summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-30 19:45:49 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-30 19:45:49 +0100
commitc1ab67674aa0dfdcf9f0e9701ac248e3eb41b19c (patch)
tree353514c16d64171352c5d1f83ab44006dd9b2f85
parent9b57814db13c29ecb08260b36923c0e1c8a373a9 (diff)
downloadvim-git-c1ab67674aa0dfdcf9f0e9701ac248e3eb41b19c.tar.gz
patch 7.4.1212v7.4.1212
Problem: Can't build with Motif. Solution: Fix function declaration.(Dominique Pelle)
-rw-r--r--src/gui_motif.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui_motif.c b/src/gui_motif.c
index 72a291529..3d77b82cd 100644
--- a/src/gui_motif.c
+++ b/src/gui_motif.c
@@ -118,7 +118,7 @@ static void gui_motif_scroll_colors(Widget id);
*/
static void
-scroll_cb(Widget w UNUSED, XtPointer client_data, call_data)
+scroll_cb(Widget w UNUSED, XtPointer client_data, XtPointer call_data)
{
scrollbar_T *sb;
long value;
diff --git a/src/version.c b/src/version.c
index 4858b6a5a..29dff3a62 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1212,
+/**/
1211,
/**/
1210,