summaryrefslogtreecommitdiff
path: root/atomic
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2006-01-13 01:52:30 +0000
committerWilliam A. Rowe Jr <wrowe@apache.org>2006-01-13 01:52:30 +0000
commit39a68b1388b1b2338d749a95274308ef95f9f968 (patch)
tree2cef0ce88ebdf55485b7745500e59ed5a736ca30 /atomic
parenta5a78d79bc4e658b07ad7d35e9fc296c566f8045 (diff)
downloadapr-39a68b1388b1b2338d749a95274308ef95f9f968.tar.gz
These args can't be volatile in MSVC 14.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@368549 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'atomic')
-rw-r--r--atomic/win32/apr_atomic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/atomic/win32/apr_atomic.c b/atomic/win32/apr_atomic.c
index 95db7503b..3b664a212 100644
--- a/atomic/win32/apr_atomic.c
+++ b/atomic/win32/apr_atomic.c
@@ -106,7 +106,7 @@ APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint3
APR_DECLARE(void *) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
{
#if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED)
- return InterlockedCompareExchangePointer(mem, with, cmp);
+ return InterlockedCompareExchangePointer((void**)mem, with, (void*)cmp);
#else
/* Too many VC6 users have stale win32 API files, stub this */
return ((apr_atomic_win32_ptr_ptr_ptr_fn)InterlockedCompareExchange)(mem, with, cmp);