[FFmpeg-cvslog] r25147 - trunk/libavformat/udp.c

[mstorsjo]

Author: mstorsjo
Date: Mon Sep 20 08:38:40 2010
New Revision: 25147

Log:
Check for the IPPROTO_IPV6 define before using it

This fixes building on FreeBSD in some configurations, if the IPv6 multicast
structs are available, but IPPROTO_IPV6 isn't defined.

Modified:
   trunk/libavformat/udp.c

Modified: trunk/libavformat/udp.c
==============================================================================
--- trunk/libavformat/udp.c	Sat Sep 18 22:44:32 2010	(r25146)
+++ trunk/libavformat/udp.c	Mon Sep 20 08:38:40 2010	(r25147)
@@ -96,7 +96,7 @@ static int udp_join_multicast_group(int 
         }
     }
 #endif
-#if HAVE_STRUCT_IPV6_MREQ
+#if HAVE_STRUCT_IPV6_MREQ && defined(IPPROTO_IPV6)
     if (addr->sa_family == AF_INET6) {
         struct ipv6_mreq mreq6;
 
@@ -125,7 +125,7 @@ static int udp_leave_multicast_group(int
         }
     }
 #endif
-#if HAVE_STRUCT_IPV6_MREQ
+#if HAVE_STRUCT_IPV6_MREQ && defined(IPPROTO_IPV6)
     if (addr->sa_family == AF_INET6) {
         struct ipv6_mreq mreq6;