You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by gs...@apache.org on 2015/04/24 04:43:30 UTC
svn commit: r1675752 - in /apr/apr/branches/1.5.x: CHANGES
atomic/win32/apr_atomic.c
Author: gsmith
Date: Fri Apr 24 02:43:30 2015
New Revision: 1675752
URL: http://svn.apache.org/r1675752
Log:
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
Modified:
apr/apr/branches/1.5.x/CHANGES
apr/apr/branches/1.5.x/atomic/win32/apr_atomic.c
Modified: apr/apr/branches/1.5.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/CHANGES?rev=1675752&r1=1675751&r2=1675752&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.5.x/CHANGES [utf-8] Fri Apr 24 02:43:30 2015
@@ -1,6 +1,10 @@
-*- coding: utf-8 -*-
Changes for APR 1.5.2
+ *) apr_atomic: 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. [Gregg Smith]
+
*) Switch to generic atomics for early/unpatched Solaris 10 not exporting
some atomic functions. PR 55418. [Yann Ylavic]
Modified: apr/apr/branches/1.5.x/atomic/win32/apr_atomic.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/atomic/win32/apr_atomic.c?rev=1675752&r1=1675751&r2=1675752&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/atomic/win32/apr_atomic.c (original)
+++ apr/apr/branches/1.5.x/atomic/win32/apr_atomic.c Fri Apr 24 02:43:30 2015
@@ -23,33 +23,12 @@ APR_DECLARE(apr_status_t) apr_atomic_ini
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(volat
{
#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_inc
/* 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(volati
{
#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(volat
{
#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_cas
{
#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(vo
{
#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_xch
{
#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
}