Merge pull request #3273 from ethomson/warnings3

More warnings

src/diff_print.c

@@ -336,7 +336,7 @@ static int format_binary(
 		"delta" : "literal";
 	const char *scan, *end;
 
-	git_buf_printf(pi->buf, "%s %lu\n", typename, inflatedlen);
+	git_buf_printf(pi->buf, "%s %" PRIuZ "\n", typename, inflatedlen);
 	pi->line.num_lines++;
 
 	for (scan = data, end = data + datalen; scan < end; ) {

src/transports/winhttp.c

@@ -1096,7 +1096,6 @@ static int winhttp_stream_write_chunked(
 	size_t len)
 {
 	winhttp_stream *s = (winhttp_stream *)stream;
-	winhttp_subtransport *t = OWNING_SUBTRANSPORT(s);
 	int error;
 
 	if (!s->request && winhttp_stream_connect(s) < 0)

src/unix/posix.h

@@ -11,6 +11,7 @@
 #include <dirent.h>
 #include <sys/param.h>
 #include <sys/time.h>
+#include <sys/stat.h>
 
 typedef int GIT_SOCKET;
 #define INVALID_SOCKET -1

tests/checkout/conflict.c

@@ -161,7 +161,10 @@ static void ensure_workdir_oid(const char *path, const char *oid_str)
 
 static void ensure_workdir_mode(const char *path, int mode)
 {
-#ifndef GIT_WIN32
+#ifdef GIT_WIN32
+	GIT_UNUSED(path);
+	GIT_UNUSED(mode);
+#else
 	git_buf fullpath = GIT_BUF_INIT;
 	struct stat st;
 

tests/index/addall.c

@@ -443,4 +443,4 @@ void test_index_addall__removes_deleted_conflicted_files(void)
 	git_annotated_commit_free(annotated);
 	git_reference_free(ref);
 	git_index_free(index);
-}
\ No newline at end of file
+}