apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r587593 - /apr/apr/trunk/atomic/win32/apr_atomic.c
Date Tue, 23 Oct 2007 18:33:15 GMT
Author: wrowe
Date: Tue Oct 23 11:33:15 2007
New Revision: 587593

URL: http://svn.apache.org/viewvc?rev=587593&view=rev
Log:
Match win32's volatility declaration (except for mingw)

Modified:
    apr/apr/trunk/atomic/win32/apr_atomic.c

Modified: apr/apr/trunk/atomic/win32/apr_atomic.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/atomic/win32/apr_atomic.c?rev=587593&r1=587592&r2=587593&view=diff
==============================================================================
--- apr/apr/trunk/atomic/win32/apr_atomic.c (original)
+++ apr/apr/trunk/atomic/win32/apr_atomic.c Tue Oct 23 11:33:15 2007
@@ -120,7 +120,9 @@
 
 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 */



Mime
View raw message