summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2013-10-21 14:16:53 -0700
committerRussell Belfer <rb@github.com>2013-10-21 14:16:53 -0700
commit623460ab139bbb0360f51b26ac27fb6932569278 (patch)
tree4c826b60417b4681ef29933096de4ba1f4d54f02
parent3b5f795446601868d52d09ebac70ae3b7aee157a (diff)
downloadlibgit2-623460ab139bbb0360f51b26ac27fb6932569278.tar.gz
Fix warnings for win64
-rw-r--r--src/diff_xdiff.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/diff_xdiff.c b/src/diff_xdiff.c
index a90f8d5d..d07a3322 100644
--- a/src/diff_xdiff.c
+++ b/src/diff_xdiff.c
@@ -53,7 +53,7 @@ typedef struct {
git_xdiff_output *xo;
git_patch *patch;
git_diff_hunk hunk;
- size_t old_lineno, new_lineno;
+ int old_lineno, new_lineno;
} git_xdiff_info;
static int diff_update_lines(
@@ -77,20 +77,20 @@ static int diff_update_lines(
case GIT_DIFF_LINE_DEL_EOFNL:
line->old_lineno = -1;
line->new_lineno = info->new_lineno;
- info->new_lineno += line->num_lines;
+ info->new_lineno += (int)line->num_lines;
break;
case GIT_DIFF_LINE_DELETION:
case GIT_DIFF_LINE_ADD_EOFNL:
line->old_lineno = info->old_lineno;
line->new_lineno = -1;
- info->old_lineno += line->num_lines;
+ info->old_lineno += (int)line->num_lines;
break;
case GIT_DIFF_LINE_CONTEXT:
case GIT_DIFF_LINE_CONTEXT_EOFNL:
line->old_lineno = info->old_lineno;
line->new_lineno = info->new_lineno;
- info->old_lineno += line->num_lines;
- info->new_lineno += line->num_lines;
+ info->old_lineno += (int)line->num_lines;
+ info->new_lineno += (int)line->num_lines;
break;
default:
giterr_set(GITERR_INVALID, "Unknown diff line origin %02x",