thodg/libgit2

diff --git a/include/git2/types.h b/include/git2/types.h
index db09f38..88f6b7d 100644
--- a/include/git2/types.h
+++ b/include/git2/types.h
@@ -57,7 +57,7 @@ typedef __time64_t  git_time_t;
 #elif defined(__MINGW32__)
 
 typedef off64_t git_off_t;
-typedef time64_t git_time_t;
+typedef __time64_t git_time_t;
 
 #else  /* POSIX */
 
diff --git a/src/fileops.c b/src/fileops.c
index e440ea6..d754c49 100644
--- a/src/fileops.c
+++ b/src/fileops.c
@@ -32,7 +32,7 @@ static int creat_tempfile(char *path_out, const char *tmp_dir, const char *filen
 	git__joinpath(path_out, tmp_dir, filename);
 	strcat(path_out, "_git2_XXXXXX");
 
-#ifdef GIT_WIN32
+#if defined(_MSC_VER)
 	/* FIXME: there may be race conditions when multi-threading
 	 * with the library */
 	if (_mktemp_s(path_out, GIT_PATH_MAX) != 0)