summaryrefslogtreecommitdiff
path: root/src/diff_driver.c
diff options
context:
space:
mode:
authorVicent Martí <vicent@github.com>2013-07-11 11:27:57 -0700
committerVicent Martí <vicent@github.com>2013-07-11 11:27:57 -0700
commitf2de67d589e4fde3378f531c782cbe176cb65f36 (patch)
tree4de47509da8826dde16846e8d04a545f2d050408 /src/diff_driver.c
parentd70ce9bd7a1acec34b283d3bc92da84fbbf79860 (diff)
parent584f2d3013df6744fa7b5c5398a78b96f31e25f4 (diff)
downloadlibgit2-f2de67d589e4fde3378f531c782cbe176cb65f36.tar.gz
Merge pull request #1719 from libgit2/arrbee/threading-primitives
Update git__swap threading primitive
Diffstat (limited to 'src/diff_driver.c')
-rw-r--r--src/diff_driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/diff_driver.c b/src/diff_driver.c
index 77b0e9f3e..e82dfa50d 100644
--- a/src/diff_driver.c
+++ b/src/diff_driver.c
@@ -374,7 +374,7 @@ static long diff_context_find(
return -1;
if (out_size > (long)ctxt->line.size)
- out_size = ctxt->line.size;
+ out_size = (long)ctxt->line.size;
memcpy(out, ctxt->line.ptr, (size_t)out_size);
return out_size;