diff options
| author | Vicent Martà <vicent@github.com> | 2012-09-04 01:06:34 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2012-09-04 01:06:34 -0700 |
| commit | af6bcd8b932be89f6499c32353b1335c9489e59f (patch) | |
| tree | e1604e384d6de0b9ade6594a91f2bce572aaf1b9 | |
| parent | 22e1b4b8a8ee8601bdd57da8cd4652afc24e068c (diff) | |
| parent | b97c169ec0e6f6297dd00cae425f91e8baeb0f58 (diff) | |
| download | libgit2-af6bcd8b932be89f6499c32353b1335c9489e59f.tar.gz | |
Merge pull request #913 from nulltoken/fix/warnings
Fix MSVC compilation warnings
| -rw-r--r-- | src/diff_output.c | 2 | ||||
| -rw-r--r-- | src/signature.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/diff_output.c b/src/diff_output.c index 2bf939f3..1f2c7233 100644 --- a/src/diff_output.c +++ b/src/diff_output.c @@ -727,7 +727,7 @@ int git_diff_entrycount(git_diff_list *diff, int delta_t) assert(diff); if (delta_t < 0) - return diff->deltas.length; + return (int)diff->deltas.length; git_vector_foreach(&diff->deltas, i, delta) { if (delta->status == (git_delta_t)delta_t) diff --git a/src/signature.c b/src/signature.c index 84c3f499..0159488a 100644 --- a/src/signature.c +++ b/src/signature.c @@ -142,7 +142,7 @@ int git_signature_now(git_signature **sig_out, const char *name, const char *ema time(&now); utc_tm = p_gmtime_r(&now, &_utc); utc_tm->tm_isdst = -1; - offset = difftime(now, mktime(utc_tm)); + offset = (time_t)difftime(now, mktime(utc_tm)); offset /= 60; if (git_signature_new(&sig, name, email, now, (int)offset) < 0) |