diff options
| author | Vicent Marti <tanoku@gmail.com> | 2012-08-02 01:38:30 +0200 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2012-08-02 01:38:30 +0200 |
| commit | e25dda51c4dc47ed99f95dae6486c6275b119484 (patch) | |
| tree | 183114622aa2dfeb224b550a07050f26cd9a0732 /tests-clar/object/blob/fromchunks.c | |
| parent | 95a1d876148ff2e09c13537c60e1dc7e10ea9295 (diff) | |
| parent | b8457baae24269c9fb777591e2a0e1b425ba31b6 (diff) | |
| download | libgit2-e25dda51c4dc47ed99f95dae6486c6275b119484.tar.gz | |
Merge remote-tracking branch 'nulltoken/topic/amd64-compat' into development
Conflicts:
src/netops.c
src/netops.h
src/oid.c
Diffstat (limited to 'tests-clar/object/blob/fromchunks.c')
| -rw-r--r-- | tests-clar/object/blob/fromchunks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests-clar/object/blob/fromchunks.c b/tests-clar/object/blob/fromchunks.c index 228e969b6..dc57d4fbe 100644 --- a/tests-clar/object/blob/fromchunks.c +++ b/tests-clar/object/blob/fromchunks.c @@ -30,7 +30,7 @@ static int text_chunked_source_cb(char *content, size_t max_length, void *payloa return 0; strcpy(content, textual_content); - return strlen(textual_content); + return (int)strlen(textual_content); } void test_object_blob_fromchunks__can_create_a_blob_from_a_in_memory_chunk_provider(void) |