summaryrefslogtreecommitdiff
path: root/atomic
diff options
context:
space:
mode:
authordavi <davi@13f79535-47bb-0310-9956-ffa450edef68>2007-08-04 20:54:07 +0000
committerdavi <davi@13f79535-47bb-0310-9956-ffa450edef68>2007-08-04 20:54:07 +0000
commitab341fdf173c937656ae73fc5e3be9bf01cdfbb3 (patch)
tree76de7ff19ee831b0148c6052e3b658ef89caa550 /atomic
parent68e97b9dda64a7723034886e69af6086b58c08ff (diff)
downloadlibapr-ab341fdf173c937656ae73fc5e3be9bf01cdfbb3.tar.gz
Prefer solaris builtins even on x86, and fix a compiler warning.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@562764 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'atomic')
-rw-r--r--atomic/unix/solaris.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/atomic/unix/solaris.c b/atomic/unix/solaris.c
index ba544522f..b3852516b 100644
--- a/atomic/unix/solaris.c
+++ b/atomic/unix/solaris.c
@@ -68,7 +68,7 @@ APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint
APR_DECLARE(void*) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
{
- return atomic_cas_ptr(mem, cmp, with);
+ return atomic_cas_ptr(mem, cmp, (void*) with);
}
APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem, void *with)