summaryrefslogtreecommitdiff
path: root/src/thread-utils.h
diff options
context:
space:
mode:
authorVicent Martí <vicent@github.com>2013-06-29 07:34:03 -0700
committerVicent Martí <vicent@github.com>2013-06-29 07:34:03 -0700
commitc61300eda94eedb53f072fedbf1bb52be21ca221 (patch)
tree4d8e650f0ca86534d8b7663d6071e31609604b2a /src/thread-utils.h
parentf2c41884c3082984f51743d557644cfa2136b878 (diff)
parentd90390c162418deb62302b3f56835ff781c0cfee (diff)
downloadlibgit2-c61300eda94eedb53f072fedbf1bb52be21ca221.tar.gz
Merge pull request #1690 from nulltoken/fix/warnings
Fix Win32/64 compilation warnings & memory leak
Diffstat (limited to 'src/thread-utils.h')
-rw-r--r--src/thread-utils.h2
1 files changed, 1 insertions, 1 deletions
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