summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-01 21:40:14 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-01 21:40:14 +0100
commit1357caf31f3e447d99baf8dd6a3243e2ab38567f (patch)
treec9bdabfe659486fcb3e4913360637371812e6053
parent19d2f1589850d7db1ce77efec052929246f156e2 (diff)
patch 7.4.1232v7.4.1232
Problem: Compiler warnings when the Sniff feature is enabled. Solution: Add UNUSED.
-rw-r--r--src/gui_gtk_x11.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index ffac20ec0f..9f6775fb8c 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -5421,9 +5421,9 @@ input_timer_cb(gpointer data)
*/
static void
sniff_request_cb(
- gpointer data,
- gint source_fd,
- GdkInputCondition condition)
+ gpointer data UNUSED,
+ gint source_fd UNUSED,
+ GdkInputCondition condition UNUSED)
{
static char_u bytes[3] = {CSI, (int)KS_EXTRA, (int)KE_SNIFF};
diff --git a/src/version.c b/src/version.c
index 911b20e92b..04231004f6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1232,
+/**/
1231,
/**/
1230,