svn commit: r663843 - in /apr/apr/branches/1.3.x: atomic/unix/solaris.c poll/unix/port.c

[he...@apache.org]

Author: henryjen
Date: Fri Jun  6 00:25:09 2008
New Revision: 663843

URL: http://svn.apache.org/viewvc?rev=663843&view=rev
Log:
backport part of r663342 from trunk to fix gcc compiler warnings on Solaris

Modified:
    apr/apr/branches/1.3.x/atomic/unix/solaris.c
    apr/apr/branches/1.3.x/poll/unix/port.c

Modified: apr/apr/branches/1.3.x/atomic/unix/solaris.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/atomic/unix/solaris.c?rev=663843&r1=663842&r2=663843&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/atomic/unix/solaris.c (original)
+++ apr/apr/branches/1.3.x/atomic/unix/solaris.c Fri Jun  6 00:25:09 2008
@@ -68,7 +68,7 @@
 
 APR_DECLARE(void*) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
 {
-    return atomic_cas_ptr(mem, cmp, (void*) with);
+    return atomic_cas_ptr(mem, (void*) cmp, with);
 }
 
 APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem, void *with)

Modified: apr/apr/branches/1.3.x/poll/unix/port.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/poll/unix/port.c?rev=663843&r1=663842&r2=663843&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/poll/unix/port.c (original)
+++ apr/apr/branches/1.3.x/poll/unix/port.c Fri Jun  6 00:25:09 2008
@@ -202,7 +202,7 @@
     pfd_elem_t *ep;
     apr_status_t rv = APR_SUCCESS;
     int res;
-    int err;
+    int err = 0;
 
     pollset_lock_rings();