From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 5 Jul 2013 18:09:16 +0000 (+0200)
Subject: updated for version 7.3.1311
X-Git-Tag: v7.3.1311
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c6f3dca4e632c810a007244bbd367ecfccca522;p=vim

updated for version 7.3.1311
Problem:    Compiler warnings on Cygwin.
Solution:   Add type casts. Add windows include files. (Ken Takata)
---

diff --git a/src/mbyte.c b/src/mbyte.c
index e0b249862..68c1e941d 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4108,7 +4108,7 @@ encname2codepage(name)
 	p += 6;
 
     if (p[0] == 'c' && p[1] == 'p')
-	cp = atoi(p + 2);
+	cp = atoi((char *)p + 2);
     else if ((idx = enc_canon_search(p)) >= 0)
 	cp = enc_canon_table[idx].codepage;
     else
diff --git a/src/ui.c b/src/ui.c
index 89ab747da..577b74230 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -18,6 +18,12 @@
 
 #include "vim.h"
 
+#ifdef FEAT_CYGWIN_WIN32_CLIPBOARD
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+# include "winclip.pro"
+#endif
+
     void
 ui_write(s, len)
     char_u  *s;
diff --git a/src/version.c b/src/version.c
index e63af1f74..98b64d1b5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1311,
 /**/
     1310,
 /**/