Mercurial > vim

changeset 5136:28e6f5f88968 v7.3.1311

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.1311 Problem: Compiler warnings on Cygwin. Solution: Add type casts. Add windows include files. (Ken Takata)
author Bram Moolenaar <bram@vim.org>
date Fri, 05 Jul 2013 20:09:16 +0200
parents 47c8addd2f35
children b20023872e3e
files src/mbyte.c src/ui.c src/version.c
diffstat 3 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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;
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1311,
+/**/
     1310,
 /**/
     1309,