atomic: Follow up r1902257: No cast for InterlockedCompareExchangePointer().
Both 32 and 64 bit InterlockedCompareExchangePointer() seem to have the same
API, so be it..
@@ -91,15 +91,6 @@ APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint3
#endif
}
-APR_DECLARE(void *) apr_atomic_casptr(void *volatile *mem, void *with, const void *cmp)
-{
-#if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED)
- return InterlockedCompareExchangePointer(mem, with, (void*)cmp);
-#else
- return InterlockedCompareExchangePointer((long volatile *)mem, with, (void*)cmp);
-#endif
-}
-
APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
{
#if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED)
@@ -109,6 +100,11 @@ APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint
#endif
}
+APR_DECLARE(void *) apr_atomic_casptr(void *volatile *mem, void *with, const void *cmp)
+{
+ return InterlockedCompareExchangePointer(mem, with, (void*)cmp);
+}
+
APR_DECLARE(void*) apr_atomic_xchgptr(void *volatile *mem, void *with)
{
return InterlockedExchangePointer(mem, with);
