diff options
| author | lhchavez <lhchavez@lhchavez.com> | 2019-01-06 08:36:06 -0800 |
|---|---|---|
| committer | lhchavez <lhchavez@lhchavez.com> | 2019-01-06 08:45:13 -0800 |
| commit | 321d19c1058fc10cb9deabccf99557ec5642a2e3 (patch) | |
| tree | fd751a5672fe29e9f18043a15bd1734142040a61 | |
| parent | b5e8272fdcab4e7f238a72d0b9c9fc9c753fd381 (diff) | |
| download | libgit2-321d19c1058fc10cb9deabccf99557ec5642a2e3.tar.gz | |
Windows is hard.
| -rw-r--r-- | src/cc-compat.h | 3 | ||||
| -rw-r--r-- | src/transports/winhttp.c | 2 | ||||
| -rw-r--r-- | tests/clar_libgit2.h | 2 | ||||
| -rw-r--r-- | tests/index/addall.c | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/cc-compat.h b/src/cc-compat.h index 5d3e652b1..893c2a4da 100644 --- a/src/cc-compat.h +++ b/src/cc-compat.h @@ -51,16 +51,19 @@ # if (SIZE_MAX == ULLONG_MAX) # define PRIuZ "I64u" # define PRIxZ "I64x" +# define PRIXZ "I64X" # define PRIdZ "I64d" # else # define PRIuZ "Iu" # define PRIxZ "Ix" +# define PRIXZ "IX" # define PRIdZ "Id" # endif #else # define PRIuZ "zu" # define PRIxZ "zx" +# define PRIXZ "zX" # define PRIdZ "zd" #endif diff --git a/src/transports/winhttp.c b/src/transports/winhttp.c index f60569519..11b4298f4 100644 --- a/src/transports/winhttp.c +++ b/src/transports/winhttp.c @@ -631,7 +631,7 @@ static int write_chunk(HINTERNET request, const char *buffer, size_t len) git_buf buf = GIT_BUF_INIT; /* Chunk header */ - git_buf_printf(&buf, "%zX\r\n", len); + git_buf_printf(&buf, "%"PRIXZ"\r\n", len); if (git_buf_oom(&buf)) return -1; diff --git a/tests/clar_libgit2.h b/tests/clar_libgit2.h index 618aed02d..8a0ff4f20 100644 --- a/tests/clar_libgit2.h +++ b/tests/clar_libgit2.h @@ -40,7 +40,7 @@ #define cl_win32_pass(expr) do { \ int _win32_res; \ if ((_win32_res = (expr)) == 0) { \ - giterr_set(GITERR_OS, "Returned: %d, system error code: %d", _win32_res, GetLastError()); \ + giterr_set(GITERR_OS, "Returned: %d, system error code: %lu", _win32_res, GetLastError()); \ cl_git_report_failure(_win32_res, 0, __FILE__, __LINE__, "System call failed: " #expr); \ } \ } while(0) diff --git a/tests/index/addall.c b/tests/index/addall.c index 12b05a741..992cd8737 100644 --- a/tests/index/addall.c +++ b/tests/index/addall.c @@ -123,8 +123,8 @@ static void check_stat_data(git_index *index, const char *path, bool match) cl_assert(st.st_ctime == entry->ctime.seconds); cl_assert(st.st_mtime == entry->mtime.seconds); cl_assert(st.st_size == entry->file_size); - cl_assert(st.st_uid == (uid_t)entry->uid); - cl_assert(st.st_gid == (gid_t)entry->gid); + cl_assert((uint32_t)st.st_uid == entry->uid); + cl_assert((uint32_t)st.st_gid == entry->gid); cl_assert_equal_i_fmt( GIT_MODE_TYPE(st.st_mode), GIT_MODE_TYPE(entry->mode), "%07o"); if (cl_is_chmod_supported()) |