summaryrefslogtreecommitdiff
path: root/atomic
diff options
context:
space:
mode:
authorGregg Lewis Smith <gsmith@apache.org>2015-04-24 02:39:14 +0000
committerGregg Lewis Smith <gsmith@apache.org>2015-04-24 02:39:14 +0000
commite621eeb85a32f989cecf6c5227d333ea0b8823d6 (patch)
treece01426baf46689b7fae3593e3b7a72fba68dcb9 /atomic
parentefe392020c548e4f853c9f410903796b450cac3d (diff)
downloadapr-e621eeb85a32f989cecf6c5227d333ea0b8823d6.tar.gz
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/trunk@1675751 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'atomic')
-rw-r--r--atomic/win32/apr_atomic.c57
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
}