summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-05-14 20:01:05 +0000
committerBram Moolenaar <Bram@vim.org>2009-05-14 20:01:05 +0000
commitd30f9d92c4e03fd1a132e3440253eb92b5c7b3e4 (patch)
tree30dc00b942144d1bcc454821acb6607b4dd8efd9 /src
parent985cb4457325915f4b0535986f7389843e959328 (diff)
downloadvim-d30f9d92c4e03fd1a132e3440253eb92b5c7b3e4.zip
updated for version 7.2-172
Diffstat (limited to 'src')
-rw-r--r--src/os_mswin.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/os_mswin.c b/src/os_mswin.c
index 60c5a81a7..94cf3a962 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -1227,8 +1227,8 @@ utf16_to_enc(short_u *str, int *lenp)
* Wait for another process to Close the Clipboard.
* Returns TRUE for success.
*/
- int
-vim_open_clipboard()
+ static int
+vim_open_clipboard(void)
{
int delay = 10;
diff --git a/src/version.c b/src/version.c
index c416f5257..0dfd5aa1d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 172,
+/**/
171,
/**/
170,