diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2012-09-20 14:06:49 +0200 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2012-09-20 14:10:05 +0200 |
| commit | 9ac8b113b18e04d4d6f0573e3a6c5e06c447dbf3 (patch) | |
| tree | 9759aa5bb4395be50fdda8589b84979d49bcd4c4 | |
| parent | 28abf3dbd27c232acd7dd17c6a642c793a3c80c9 (diff) | |
| download | libgit2-9ac8b113b18e04d4d6f0573e3a6c5e06c447dbf3.tar.gz | |
Fix MSVC amd64 compilation warnings
| -rw-r--r-- | src/checkout.c | 2 | ||||
| -rw-r--r-- | src/diff_output.c | 4 | ||||
| -rw-r--r-- | src/transports/http.c | 2 | ||||
| -rw-r--r-- | src/win32/utf-conv.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/checkout.c b/src/checkout.c index 730e8a499..89f73549f 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -25,7 +25,7 @@ struct checkout_diff_data { git_buf *path; - int workdir_len; + size_t workdir_len; git_checkout_opts *checkout_opts; git_indexer_stats *stats; git_repository *owner; diff --git a/src/diff_output.c b/src/diff_output.c index 37cceff92..58a1a3567 100644 --- a/src/diff_output.c +++ b/src/diff_output.c @@ -1354,9 +1354,9 @@ int git_diff_iterator_num_lines_in_hunk(git_diff_iterator *iter) return error; if (iter->hunk_curr) - return iter->hunk_curr->line_count; + return (int)iter->hunk_curr->line_count; if (iter->hunk_head) - return iter->hunk_head->line_count; + return (int)iter->hunk_head->line_count; return 0; } diff --git a/src/transports/http.c b/src/transports/http.c index 456b85e3f..d5015f5af 100644 --- a/src/transports/http.c +++ b/src/transports/http.c @@ -166,7 +166,7 @@ static int send_request(transport_http *t, const char *service, void *data, ssiz } if (WinHttpSendRequest(t->request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, - data, content_length, content_length, 0) == FALSE) { + data, (DWORD)content_length, (DWORD)content_length, 0) == FALSE) { giterr_set(GITERR_OS, "Failed to send request"); goto on_error; } diff --git a/src/win32/utf-conv.c b/src/win32/utf-conv.c index 88a84141e..396af7cad 100644 --- a/src/win32/utf-conv.c +++ b/src/win32/utf-conv.c @@ -72,7 +72,7 @@ void git__utf8_to_16(wchar_t *dest, size_t length, const char *src) void git__utf8_to_16(wchar_t *dest, size_t length, const char *src) { - MultiByteToWideChar(CP_UTF8, 0, src, -1, dest, length); + MultiByteToWideChar(CP_UTF8, 0, src, -1, dest, (int)length); } void git__utf16_to_8(char *out, const wchar_t *input) |