summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-04-28 22:20:03 +0200
committerBram Moolenaar <Bram@vim.org>2016-04-28 22:20:03 +0200
commitc61348e83fd4eed8b999fe5b7cdfb4caf90bf3fd (patch)
tree973264c18258283ca72dd5f4a6fd3c5e30087ca3
parent283ee8b3a07b9da18f6c73f35cf465b83f96406a (diff)
downloadvim-git-c61348e83fd4eed8b999fe5b7cdfb4caf90bf3fd.tar.gz
patch 7.4.1797v7.4.1797
Problem: Warning from Windows 64 bit compiler. Solution: Change int to size_t. (Mike Williams)
-rw-r--r--src/term.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/term.c b/src/term.c
index 61200d2cd..cc9d7ad09 100644
--- a/src/term.c
+++ b/src/term.c
@@ -6174,7 +6174,7 @@ gui_get_color_cmn(char_u *name)
while (!feof(fd))
{
- int len;
+ size_t len;
int pos;
(void)fgets(line, LINE_LEN, fd);
diff --git a/src/version.c b/src/version.c
index e4a4cfa19..4fb17c440 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1797,
+/**/
1796,
/**/
1795,