Merge pull request #4210 from pks-t/pks/misc-fixes

Misc fixes

include/git2/global.h

@@ -14,7 +14,7 @@ GIT_BEGIN_DECL
 /**
  * Init the global state
  *
- * This function must the called before any other libgit2 function in
+ * This function must be called before any other libgit2 function in
  * order to set up global state and threading.
  *
  * This function may be called multiple times - it will return the number

tests/threads/diff.c

@@ -19,7 +19,9 @@ static git_repository *_repo;
 static git_tree *_a, *_b;
 static git_atomic _counts[4];
 static int _check_counts;
+#ifdef GIT_WIN32
 static int _retries;
+#endif
 
 #define THREADS 20