Commit e70a1a42 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Fixup DCCP include ordering

parent 0ae73f10
...@@ -53,6 +53,13 @@ ...@@ -53,6 +53,13 @@
# endif # endif
#endif #endif
#ifdef HAVE_LINUX_DCCP_H
# include <linux/dccp.h>
# ifndef SOCK_DCCP /* provisional API */
# define SOCK_DCCP 6
# endif
#endif
#ifndef SOL_IP #ifndef SOL_IP
# define SOL_IP IPPROTO_IP # define SOL_IP IPPROTO_IP
#endif #endif
...@@ -75,13 +82,6 @@ ...@@ -75,13 +82,6 @@
# define IPPROTO_UDPLITE 136 /* IANA */ # define IPPROTO_UDPLITE 136 /* IANA */
#endif #endif
#ifdef HAVE_LINUX_DCCP_H
# include <linux/dccp.h>
# ifndef SOCK_DCCP /* provisional API */
# define SOCK_DCCP 6
# endif
#endif
#if defined (HAVE_NETINET_UDPLITE_H) #if defined (HAVE_NETINET_UDPLITE_H)
# include <netinet/udplite.h> # include <netinet/udplite.h>
#elif defined (__linux__) #elif defined (__linux__)
...@@ -379,7 +379,7 @@ net_IPv6Join (vlc_object_t *obj, int fd, const struct sockaddr_in6 *src) ...@@ -379,7 +379,7 @@ net_IPv6Join (vlc_object_t *obj, int fd, const struct sockaddr_in6 *src)
msg_Dbg (obj, "IPV6_JOIN_GROUP multicast request"); msg_Dbg (obj, "IPV6_JOIN_GROUP multicast request");
if (!setsockopt (fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &gr6, sizeof (gr6))) if (!setsockopt (fd, SOL_IPV6, IPV6_JOIN_GROUP, &gr6, sizeof (gr6)))
return 0; return 0;
#else #else
errno = ENOSYS; errno = ENOSYS;
......
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