diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-10-13 11:01:52 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2014-10-13 11:01:52 -0400 |
| commit | 24deacb7ee7d4c77eaa4606afb21988d9fae8aa2 (patch) | |
| tree | 4fef3b333f18bff3cfefe592d678c56a0b2b5a6f | |
| parent | 9e49cb7a4ba4f6961e3681cb59421cec04a50893 (diff) | |
| parent | cf1013a888b16c22e8877fa0c8c9532972cb1b67 (diff) | |
| download | libgit2-24deacb7ee7d4c77eaa4606afb21988d9fae8aa2.tar.gz | |
Merge pull request #2618 from csware/msvc-no-z-prefix
There is no "z" size specifier on MSVC
| -rw-r--r-- | src/cc-compat.h | 2 | ||||
| -rw-r--r-- | src/tree-cache.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/cc-compat.h b/src/cc-compat.h index 0b66d8ba1..cefdc928b 100644 --- a/src/cc-compat.h +++ b/src/cc-compat.h @@ -49,9 +49,11 @@ #if defined(_MSC_VER) || defined(__MINGW32__) # define PRIuZ "Iu" # define PRIxZ "Ix" +# define PRIdZ "Id" #else # define PRIuZ "zu" # define PRIxZ "zx" +# define PRIdZ "zd" #endif /* Micosoft Visual C/C++ */ diff --git a/src/tree-cache.c b/src/tree-cache.c index bf52b5530..aaf8a132c 100644 --- a/src/tree-cache.c +++ b/src/tree-cache.c @@ -278,7 +278,7 @@ static void write_tree(git_buf *out, git_tree_cache *tree) { size_t i; - git_buf_printf(out, "%s%c%zd %"PRIuZ"\n", tree->name, 0, tree->entry_count, tree->children_count); + git_buf_printf(out, "%s%c%"PRIdZ" %"PRIuZ"\n", tree->name, 0, tree->entry_count, tree->children_count); if (tree->entry_count != -1) git_buf_put(out, (const char *) &tree->oid, GIT_OID_RAWSZ); |