apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r153917 - in apr/apr/trunk: include/apr_network_io.h network_io/unix/multicast.c
Date Tue, 15 Feb 2005 08:26:48 GMT
Author: jorton
Date: Tue Feb 15 00:26:46 2005
New Revision: 153917

URL: http://svn.apache.org/viewcvs?view=rev&rev=153917
Log:
* network_io/unix/multicast.c (apr_mcast_leave): Rename 'leave'
argument to 'addr' to fix Tru64 5.0 build, where "leave" is #defined
to some weird builtin.

Modified:
    apr/apr/trunk/include/apr_network_io.h
    apr/apr/trunk/network_io/unix/multicast.c

Modified: apr/apr/trunk/include/apr_network_io.h
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/include/apr_network_io.h?view=diff&r1=153916&r2=153917
==============================================================================
--- apr/apr/trunk/include/apr_network_io.h (original)
+++ apr/apr/trunk/include/apr_network_io.h Tue Feb 15 00:26:46 2005
@@ -771,14 +771,14 @@
  * Leave a Multicast Group.  All arguments must be the same as
  * apr_mcast_join.
  * @param sock The socket to leave a multicast group
- * @param leave The address of the multicast group to leave
+ * @param addr The address of the multicast group to leave
  * @param iface Address of the interface to use.  If NULL is passed, the 
  *              default multicast interface will be used. (OS Dependent)
  * @param source Source Address to accept transmissions from (non-NULL 
  *               implies Source-Specific Multicast)
  */
 APR_DECLARE(apr_status_t) apr_mcast_leave(apr_socket_t *sock,
-                                          apr_sockaddr_t *leave,
+                                          apr_sockaddr_t *addr,
                                           apr_sockaddr_t *iface,
                                           apr_sockaddr_t *source);
 

Modified: apr/apr/trunk/network_io/unix/multicast.c
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/network_io/unix/multicast.c?view=diff&r1=153916&r2=153917
==============================================================================
--- apr/apr/trunk/network_io/unix/multicast.c (original)
+++ apr/apr/trunk/network_io/unix/multicast.c Tue Feb 15 00:26:46 2005
@@ -268,12 +268,12 @@
 }
 
 APR_DECLARE(apr_status_t) apr_mcast_leave(apr_socket_t *sock,
-                                          apr_sockaddr_t *leave,
+                                          apr_sockaddr_t *addr,
                                           apr_sockaddr_t *iface,
                                           apr_sockaddr_t *source)
 {
 #ifdef IP_DROP_MEMBERSHIP
-    return do_mcast(IP_DROP_MEMBERSHIP, sock, leave, iface, source);
+    return do_mcast(IP_DROP_MEMBERSHIP, sock, addr, iface, source);
 #else
     return APR_ENOTIMPL;
 #endif



Mime
View raw message