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 e0b249862543e094f4c9dfce9d7c59319052d739..68c1e941dcfb81a77a48a41bdfacaeb716edf66c 100644 (file)
--- 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 89ab747da25042f8c650144ed18d91fb277c971a..577b74230ae47c692904057ae4b9d32ebc6f3d22 100644 (file)
--- 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 e63af1f7485ca68aa2ed83018100c045e9522187..98b64d1b52aa644992089c8eaeee6ce5d2e729ce 100644 (file)
--- 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,
 /**/