diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2007-10-23 18:33:15 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2007-10-23 18:33:15 +0000 |
| commit | 0b15965016001690c39edb12c12eedef3ccbfab7 (patch) | |
| tree | 751248e3166b762f1c659d6103dd535cf4828324 /atomic | |
| parent | 0fdf3b8279c759b1e82e3c509870227dd51c0489 (diff) | |
| download | libapr-0b15965016001690c39edb12c12eedef3ccbfab7.tar.gz | |
Match win32's volatility declaration (except for mingw)
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@587593 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'atomic')
| -rw-r--r-- | atomic/win32/apr_atomic.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/atomic/win32/apr_atomic.c b/atomic/win32/apr_atomic.c index 16e10ec29..d1b4e7e34 100644 --- a/atomic/win32/apr_atomic.c +++ b/atomic/win32/apr_atomic.c @@ -120,7 +120,9 @@ 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(__MINGW32__)) && !defined(RC_INVOKED) +#if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED) + return InterlockedCompareExchangePointer((void* volatile*)mem, with, (void*)cmp); +#elseif defined(__MINGW32__) return InterlockedCompareExchangePointer((void**)mem, with, (void*)cmp); #else /* Too many VC6 users have stale win32 API files, stub this */ |