summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-11-30 13:42:44 +0100
committerBram Moolenaar <Bram@vim.org>2011-11-30 13:42:44 +0100
commit26fdd7da96865a96e7a7b1efec130106499cd29f (patch)
tree1536babd8d555be8bae2032d6a4c279c0ad72d2f
parent6d8f9c6f59f49c3810e5336e1a558f3d61acd30e (diff)
updated for version 7.3.357v7.3.357
Problem: Compiler warning in MS-Windows console build. Solution: Adjust return type of PrintHookProc(). (Mike Williams)
-rw-r--r--src/os_mswin.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/os_mswin.c b/src/os_mswin.c
index 839c3df5b5..b4f662ad52 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -1869,7 +1869,7 @@ AbortProc(HDC hdcPrn, int iCode)
#ifndef FEAT_GUI
- static UINT CALLBACK
+ static UINT_PTR CALLBACK
PrintHookProc(
HWND hDlg, // handle to dialog box
UINT uiMsg, // message identifier
diff --git a/src/version.c b/src/version.c
index 7a13d1315f..2e3922e970 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 357,
+/**/
356,
/**/
355,