You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by sc...@apache.org on 2015/01/07 18:17:37 UTC
svn commit: r1650120 - in /tomcat/native/branches/1.1.x: ./
native/src/multicast.c
Author: schultz
Date: Wed Jan 7 17:17:37 2015
New Revision: 1650120
URL: http://svn.apache.org/r1650120
Log:
Back-port r1650119 to remove superfluous semicolons after close-braces to eliminate compiler warnings.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/multicast.c
Propchange: tomcat/native/branches/1.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 7 17:17:37 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821
+/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/src/multicast.c
URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/multicast.c?rev=1650120&r1=1650119&r2=1650120&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/multicast.c (original)
+++ tomcat/native/branches/1.1.x/native/src/multicast.c Wed Jan 7 17:17:37 2015
@@ -32,7 +32,7 @@ TCN_IMPLEMENT_CALL(jint, Multicast, join
apr_sockaddr_t *sa = J2P(source, apr_sockaddr_t *);
UNREFERENCED_STDARGS;
return (jint)apr_mcast_join(s->sock, ja, ia, sa);
-};
+}
TCN_IMPLEMENT_CALL(jint, Multicast, leave)(TCN_STDARGS,
jlong sock, jlong addr,
@@ -44,7 +44,7 @@ TCN_IMPLEMENT_CALL(jint, Multicast, leav
apr_sockaddr_t *sa = J2P(source, apr_sockaddr_t *);
UNREFERENCED_STDARGS;
return (jint)apr_mcast_leave(s->sock, aa, ia, sa);
-};
+}
TCN_IMPLEMENT_CALL(jint, Multicast, hops)(TCN_STDARGS,
jlong sock, jint ttl)
@@ -52,7 +52,7 @@ TCN_IMPLEMENT_CALL(jint, Multicast, hops
tcn_socket_t *s = J2P(sock, tcn_socket_t *);
UNREFERENCED_STDARGS;
return (jint)apr_mcast_hops(s->sock, (apr_byte_t)ttl);
-};
+}
TCN_IMPLEMENT_CALL(jint, Multicast, loopback)(TCN_STDARGS,
jlong sock, jboolean opt)
@@ -63,7 +63,7 @@ TCN_IMPLEMENT_CALL(jint, Multicast, loop
if (opt)
on = 1;
return (jint)apr_mcast_loopback(s->sock, on);
-};
+}
TCN_IMPLEMENT_CALL(jint, Multicast, ointerface)(TCN_STDARGS,
jlong sock, jlong iface)
@@ -72,4 +72,4 @@ TCN_IMPLEMENT_CALL(jint, Multicast, oint
apr_sockaddr_t *ia = J2P(iface, apr_sockaddr_t *);
UNREFERENCED_STDARGS;
return (jint)apr_mcast_interface(s->sock, ia);
-};
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org