summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-04-03 22:22:30 +0200
committerBram Moolenaar <Bram@vim.org>2016-04-03 22:22:30 +0200
commite185c1efba3cb2611ac303c39a08e908497cbac4 (patch)
tree1ecb4980db982ee1c9826337fa4bf069f062e133
parent7c1c6dbb6817640fd3956a0d5417da23fde336d8 (diff)
downloadvim-git-e185c1efba3cb2611ac303c39a08e908497cbac4.tar.gz
patch 7.4.1706v7.4.1706
Problem: Old style function declaration breaks build. Solution: Remove __ARGS().
-rw-r--r--src/proto/os_mswin.pro2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/proto/os_mswin.pro b/src/proto/os_mswin.pro
index fb2da9371..d25c17404 100644
--- a/src/proto/os_mswin.pro
+++ b/src/proto/os_mswin.pro
@@ -49,7 +49,7 @@ void serverForeground(char_u *name);
char_u *serverGetReply(HWND server, int *expr_res, int remove, int wait);
void serverProcessPendingMessages(void);
char *charset_id2name(int id);
-char *quality_id2name __ARGS((DWORD id));
+char *quality_id2name(DWORD id);
int get_logfont(LOGFONT *lf, char_u *name, HDC printer_dc, int verbose);
void channel_init_winsock(void);
/* vim: set ft=c : */
diff --git a/src/version.c b/src/version.c
index aefcfae15..4502f7fdf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1706,
+/**/
1705,
/**/
1704,