apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r562764 - in /apr/apr/trunk: atomic/unix/solaris.c include/arch/unix/apr_arch_atomic.h
Date Sat, 04 Aug 2007 20:54:08 GMT
Author: davi
Date: Sat Aug  4 13:54:07 2007
New Revision: 562764

URL: http://svn.apache.org/viewvc?view=rev&rev=562764
Log:
Prefer solaris builtins even on x86, and fix a compiler warning.

Modified:
    apr/apr/trunk/atomic/unix/solaris.c
    apr/apr/trunk/include/arch/unix/apr_arch_atomic.h

Modified: apr/apr/trunk/atomic/unix/solaris.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/atomic/unix/solaris.c?view=diff&rev=562764&r1=562763&r2=562764
==============================================================================
--- apr/apr/trunk/atomic/unix/solaris.c (original)
+++ apr/apr/trunk/atomic/unix/solaris.c Sat Aug  4 13:54:07 2007
@@ -68,7 +68,7 @@
 
 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)

Modified: apr/apr/trunk/include/arch/unix/apr_arch_atomic.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/unix/apr_arch_atomic.h?view=diff&rev=562764&r1=562763&r2=562764
==============================================================================
--- apr/apr/trunk/include/arch/unix/apr_arch_atomic.h (original)
+++ apr/apr/trunk/include/arch/unix/apr_arch_atomic.h Sat Aug  4 13:54:07 2007
@@ -30,10 +30,10 @@
 #   define USE_ATOMICS_GENERIC
 #elif HAVE_ATOMIC_BUILTINS
 #   define USE_ATOMICS_BUILTINS
-#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-#   define USE_ATOMICS_IA32
 #elif defined(SOLARIS2) && SOLARIS2 >= 10
 #   define USE_ATOMICS_SOLARIS
+#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+#   define USE_ATOMICS_IA32
 #elif defined(__GNUC__) && (defined(__PPC__) || defined(__ppc__))
 #   define USE_ATOMICS_PPC
 #elif defined(__GNUC__) && (defined(__s390__) || defined(__s390x__))



Mime
View raw message