Commit a0b2de73 authored by Felix Paul Kühne's avatar Felix Paul Kühne

src: fixed multicast reception on OS X when using the 10.7 SDK (close #6104)

(cherry picked from commit 84dc949e)
parent 8a99cd63
...@@ -381,7 +381,9 @@ net_SourceSubscribe (vlc_object_t *obj, int fd, ...@@ -381,7 +381,9 @@ net_SourceSubscribe (vlc_object_t *obj, int fd,
int net_Subscribe (vlc_object_t *obj, int fd, int net_Subscribe (vlc_object_t *obj, int fd,
const struct sockaddr *grp, socklen_t grplen) const struct sockaddr *grp, socklen_t grplen)
{ {
#ifdef MCAST_JOIN_GROUP /* MCAST_JOIN_GROUP was introduced to OS X in v10.7, but it doesn't work,
* so ignore it to use the same code as on 10.5 or 10.6 */
#if defined (MCAST_JOIN_GROUP) && !defined (__APPLE__)
/* Agnostic SSM multicast join */ /* Agnostic SSM multicast join */
int level; int level;
struct group_req gr; struct group_req gr;
...@@ -417,6 +419,7 @@ int net_Subscribe (vlc_object_t *obj, int fd, ...@@ -417,6 +419,7 @@ int net_Subscribe (vlc_object_t *obj, int fd,
return 0; return 0;
#else #else
VLC_UNUSED( grplen );
switch (grp->sa_family) switch (grp->sa_family)
{ {
# ifdef IPV6_JOIN_GROUP # ifdef IPV6_JOIN_GROUP
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment