diff options
author | Gregg Lewis Smith <gsmith@apache.org> | 2015-04-24 02:50:44 +0000 |
---|---|---|
committer | Gregg Lewis Smith <gsmith@apache.org> | 2015-04-24 02:50:44 +0000 |
commit | dae1db5df1e6e0ff0c69b879462d198260c2f965 (patch) | |
tree | 7863c28a215c3be95ca265f164674d16c6f3ed4b /atomic | |
parent | ef385f75a5948205c73f7746085951fc52b5ff7b (diff) | |
download | apr-dae1db5df1e6e0ff0c69b879462d198260c2f965.tar.gz |
Backport r1675751 from trunk
Fix errors when building on Visual Studio 2013 while
maintaining the ability to build on Visual Studio 6 with
Windows Server 2003 R2 SDK.
PR: 57191
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1675753 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'atomic')
-rw-r--r-- | atomic/win32/apr_atomic.c | 57 |
1 files changed, 8 insertions, 49 deletions
diff --git a/atomic/win32/apr_atomic.c b/atomic/win32/apr_atomic.c index 1ed7df893..e1bc18e90 100644 --- a/atomic/win32/apr_atomic.c +++ b/atomic/win32/apr_atomic.c @@ -23,33 +23,12 @@ APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p) return APR_SUCCESS; } -/* - * Remapping function pointer type to accept apr_uint32_t's type-safely - * as the arguments for as our apr_atomic_foo32 Functions - */ -typedef WINBASEAPI apr_uint32_t (WINAPI * apr_atomic_win32_ptr_fn) - (apr_uint32_t volatile *); -typedef WINBASEAPI apr_uint32_t (WINAPI * apr_atomic_win32_ptr_val_fn) - (apr_uint32_t volatile *, - apr_uint32_t); -typedef WINBASEAPI apr_uint32_t (WINAPI * apr_atomic_win32_ptr_val_val_fn) - (apr_uint32_t volatile *, - apr_uint32_t, apr_uint32_t); -typedef WINBASEAPI void * (WINAPI * apr_atomic_win32_ptr_ptr_ptr_fn) - (volatile void **, - void *, const void *); -typedef WINBASEAPI void * (WINAPI * apr_atomic_win32_ptr_ptr_fn) - (volatile void **, - void *); - APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val) { #if (defined(_M_IA64) || defined(_M_AMD64)) return InterlockedExchangeAdd(mem, val); -#elif defined(__MINGW32__) - return InterlockedExchangeAdd((long *)mem, val); #else - return ((apr_atomic_win32_ptr_val_fn)InterlockedExchangeAdd)(mem, val); + return InterlockedExchangeAdd((long *)mem, val); #endif } @@ -62,10 +41,8 @@ APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val) { #if (defined(_M_IA64) || defined(_M_AMD64)) InterlockedExchangeAdd(mem, -val); -#elif defined(__MINGW32__) - InterlockedExchangeAdd((long *)mem, -val); #else - ((apr_atomic_win32_ptr_val_fn)InterlockedExchangeAdd)(mem, -val); + InterlockedExchangeAdd((long *)mem, -val); #endif } @@ -74,10 +51,8 @@ APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem) /* we return old value, win32 returns new value :( */ #if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED) return InterlockedIncrement(mem) - 1; -#elif defined(__MINGW32__) - return InterlockedIncrement((long *)mem) - 1; #else - return ((apr_atomic_win32_ptr_fn)InterlockedIncrement)(mem) - 1; + return InterlockedIncrement((long *)mem) - 1; #endif } @@ -85,10 +60,8 @@ APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem) { #if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED) return InterlockedDecrement(mem); -#elif defined(__MINGW32__) - return InterlockedDecrement((long *)mem); #else - return ((apr_atomic_win32_ptr_fn)InterlockedDecrement)(mem); + return InterlockedDecrement((long *)mem); #endif } @@ -96,10 +69,8 @@ APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val) { #if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED) InterlockedExchange(mem, val); -#elif defined(__MINGW32__) - InterlockedExchange((long*)mem, val); #else - ((apr_atomic_win32_ptr_val_fn)InterlockedExchange)(mem, val); + InterlockedExchange((long*)mem, val); #endif } @@ -113,10 +84,8 @@ APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint3 { #if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED) return InterlockedCompareExchange(mem, with, cmp); -#elif defined(__MINGW32__) - return InterlockedCompareExchange((long*)mem, with, cmp); #else - return ((apr_atomic_win32_ptr_val_val_fn)InterlockedCompareExchange)(mem, with, cmp); + return InterlockedCompareExchange((long*)mem, with, cmp); #endif } @@ -124,11 +93,8 @@ APR_DECLARE(void *) apr_atomic_casptr(volatile void **mem, void *with, const voi { #if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED) return InterlockedCompareExchangePointer((void* volatile*)mem, with, (void*)cmp); -#elif defined(__MINGW32__) - 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); + return InterlockedCompareExchangePointer((void**)mem, with, (void*)cmp); #endif } @@ -136,19 +102,12 @@ APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint { #if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED) return InterlockedExchange(mem, val); -#elif defined(__MINGW32__) - return InterlockedExchange((long *)mem, val); #else - return ((apr_atomic_win32_ptr_val_fn)InterlockedExchange)(mem, val); + return InterlockedExchange((long *)mem, val); #endif } APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem, void *with) { -#if (defined(_M_IA64) || defined(_M_AMD64) || defined(__MINGW32__)) && !defined(RC_INVOKED) return InterlockedExchangePointer((void**)mem, with); -#else - /* Too many VC6 users have stale win32 API files, stub this */ - return ((apr_atomic_win32_ptr_ptr_fn)InterlockedExchange)(mem, with); -#endif } |