You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@apr.apache.org by wr...@apache.org on 2007/10/23 20:36:03 UTC

svn commit: r587595 - /apr/apr/branches/1.2.x/atomic/win32/apr_atomic.c

Author: wrowe
Date: Tue Oct 23 11:36:03 2007
New Revision: 587595

URL: http://svn.apache.org/viewvc?rev=587595&view=rev
Log:
Match win32's volatility declaration (backport trunk)

Modified:
    apr/apr/branches/1.2.x/atomic/win32/apr_atomic.c

Modified: apr/apr/branches/1.2.x/atomic/win32/apr_atomic.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/atomic/win32/apr_atomic.c?rev=587595&r1=587594&r2=587595&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/atomic/win32/apr_atomic.c (original)
+++ apr/apr/branches/1.2.x/atomic/win32/apr_atomic.c Tue Oct 23 11:36:03 2007
@@ -106,7 +106,7 @@
 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* volatile*)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);