diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/diff_tform.c | 2 | ||||
| -rw-r--r-- | src/thread-utils.h | 2 | ||||
| -rw-r--r-- | src/win32/findfile.c | 8 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/diff_tform.c b/src/diff_tform.c index 8c4e96ecf..b137bd319 100644 --- a/src/diff_tform.c +++ b/src/diff_tform.c @@ -900,7 +900,7 @@ find_best_matches: } /* otherwise, if we just overwrote a source, update mapping */ else if (j > i && match_srcs[i].similarity > 0) { - match_tgts[match_srcs[i].idx].idx = j; + match_tgts[match_srcs[i].idx].idx = (uint32_t)j; } num_updates++; diff --git a/src/thread-utils.h b/src/thread-utils.h index 83148188d..f19a2ba2c 100644 --- a/src/thread-utils.h +++ b/src/thread-utils.h @@ -104,7 +104,7 @@ GIT_INLINE(void *) git___compare_and_swap( { volatile void *foundval; #if defined(GIT_WIN32) - foundval = InterlockedCompareExchangePointer(ptr, newval, oldval); + foundval = InterlockedCompareExchangePointer((volatile PVOID *)ptr, newval, oldval); #elif defined(__GNUC__) foundval = __sync_val_compare_and_swap(ptr, oldval, newval); #else diff --git a/src/win32/findfile.c b/src/win32/findfile.c index 5dd3de13d..9d9051bff 100644 --- a/src/win32/findfile.c +++ b/src/win32/findfile.c @@ -156,7 +156,7 @@ static int win32_find_git_in_registry( } static int win32_find_existing_dirs( - git_buf *out, const wchar_t *tmpl[], char *temp[]) + git_buf *out, const wchar_t *tmpl[]) { struct git_win32__path path16; git_buf buf = GIT_BUF_INIT; @@ -209,7 +209,6 @@ int git_win32__find_system_dirs(git_buf *out) int git_win32__find_global_dirs(git_buf *out) { - char *temp[3]; static const wchar_t *global_tmpls[4] = { L"%HOME%\\", L"%HOMEDRIVE%%HOMEPATH%\\", @@ -217,12 +216,11 @@ int git_win32__find_global_dirs(git_buf *out) NULL, }; - return win32_find_existing_dirs(out, global_tmpls, temp); + return win32_find_existing_dirs(out, global_tmpls); } int git_win32__find_xdg_dirs(git_buf *out) { - char *temp[6]; static const wchar_t *global_tmpls[7] = { L"%XDG_CONFIG_HOME%\\git", L"%APPDATA%\\git", @@ -233,5 +231,5 @@ int git_win32__find_xdg_dirs(git_buf *out) NULL, }; - return win32_find_existing_dirs(out, global_tmpls, temp); + return win32_find_existing_dirs(out, global_tmpls); } |