diff options
| author | Patrick Steinhardt <ps@pks.im> | 2017-04-21 15:39:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-21 15:39:03 +0200 |
| commit | 0d2f6824ebf0bf9cb6c2bfb0ac9072d9dbb474c0 (patch) | |
| tree | efca139a9f99d08d76e1de5029bb8d240e3211ea | |
| parent | 8d89e409616831b7b30a5ca7b89354957137b65e (diff) | |
| parent | 13c275aba50346b56f9a6787a9e3f3d73ec0c9a9 (diff) | |
| download | libgit2-0d2f6824ebf0bf9cb6c2bfb0ac9072d9dbb474c0.tar.gz | |
Merge pull request #4210 from pks-t/pks/misc-fixes
Misc fixes
| -rw-r--r-- | include/git2/global.h | 2 | ||||
| -rw-r--r-- | tests/threads/diff.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/git2/global.h b/include/git2/global.h index ce5bdf444..2a87e10c6 100644 --- a/include/git2/global.h +++ b/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 diff --git a/tests/threads/diff.c b/tests/threads/diff.c index 90d35b15e..256040265 100644 --- a/tests/threads/diff.c +++ b/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 |