diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
| commit | b250f9c66d3ddd84652d158fb979a5f21e3f2c71 (patch) | |
| tree | ef84366029d6f8af6ed82e90c5f188bb7dfc844d /libavformat/udp.c | |
| parent | 959da985b03570cfe7d239c0ba6d550ecb04c460 (diff) | |
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/udp.c')
| -rw-r--r-- | libavformat/udp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/udp.c b/libavformat/udp.c index 1101ffcf9a..f433e075af 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -29,7 +29,7 @@ #include <unistd.h> #include "network.h" #include "os_support.h" -#ifdef HAVE_SYS_SELECT_H +#if HAVE_SYS_SELECT_H #include <sys/select.h> #endif #include <sys/time.h> @@ -52,7 +52,7 @@ typedef struct { int is_multicast; int local_port; int reuse_socket; -#ifndef CONFIG_IPV6 +#if !CONFIG_IPV6 struct sockaddr_in dest_addr; #else struct sockaddr_storage dest_addr; @@ -72,7 +72,7 @@ static int udp_set_multicast_ttl(int sockfd, int mcastTTL, struct sockaddr *addr } } #endif -#ifdef CONFIG_IPV6 +#if CONFIG_IPV6 if (addr->sa_family == AF_INET6) { if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &mcastTTL, sizeof(mcastTTL)) < 0) { av_log(NULL, AV_LOG_ERROR, "setsockopt(IPV6_MULTICAST_HOPS): %s\n", strerror(errno)); @@ -96,7 +96,7 @@ static int udp_join_multicast_group(int sockfd, struct sockaddr *addr) { } } #endif -#ifdef CONFIG_IPV6 +#if CONFIG_IPV6 if (addr->sa_family == AF_INET6) { struct ipv6_mreq mreq6; @@ -124,7 +124,7 @@ static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr) { } } #endif -#ifdef CONFIG_IPV6 +#if CONFIG_IPV6 if (addr->sa_family == AF_INET6) { struct ipv6_mreq mreq6; @@ -139,7 +139,7 @@ static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr) { return 0; } -#ifdef CONFIG_IPV6 +#if CONFIG_IPV6 static struct addrinfo* udp_ipv6_resolve_host(const char *hostname, int port, int type, int family, int flags) { struct addrinfo hints, *res = 0; int error; @@ -342,7 +342,7 @@ static int udp_open(URLContext *h, const char *uri, int flags) int is_output; const char *p; char buf[256]; -#ifndef CONFIG_IPV6 +#if !CONFIG_IPV6 struct sockaddr_in my_addr; #else struct sockaddr_storage my_addr; |