# HG changeset patch # User conrad # Date 1267991339 0 # Node ID a292ef47e2f98c37c99bfc7b1461508f9738743c # Parent 6d4ba584fcf25da0dbbaa03eba9d1d00352ba267 Localize the #define _SVID_SOURCE needed for inet_aton() to os_support.c diff -r 6d4ba584fcf2 -r a292ef47e2f9 network.h --- a/network.h Sun Mar 07 08:52:53 2010 +0000 +++ b/network.h Sun Mar 07 19:48:59 2010 +0000 @@ -63,10 +63,7 @@ #endif } -#if !HAVE_INET_ATON -/* in os_support.c */ -int inet_aton (const char * str, struct in_addr * add); -#endif +int ff_inet_aton (const char * str, struct in_addr * add); #if !HAVE_STRUCT_SOCKADDR_STORAGE struct sockaddr_storage { diff -r 6d4ba584fcf2 -r a292ef47e2f9 os_support.c --- a/os_support.c Sun Mar 07 08:52:53 2010 +0000 +++ b/os_support.c Sun Mar 07 19:48:59 2010 +0000 @@ -45,7 +45,7 @@ #include #include -int inet_aton (const char * str, struct in_addr * add) +int ff_inet_aton (const char * str, struct in_addr * add) { unsigned int add1 = 0, add2 = 0, add3 = 0, add4 = 0; @@ -58,6 +58,11 @@ return 1; } +#else +int ff_inet_aton (const char * str, struct in_addr * add) +{ + return inet_aton(str, add); +} #endif /* !HAVE_INET_ATON */ #if !HAVE_GETADDRINFO @@ -85,7 +90,7 @@ sin->sin_family = AF_INET; if (node) { - if (!inet_aton(node, &sin->sin_addr)) { + if (!ff_inet_aton(node, &sin->sin_addr)) { if (hints && (hints->ai_flags & AI_NUMERICHOST)) { av_free(sin); return EAI_FAIL; @@ -221,7 +226,7 @@ int resolve_host(struct in_addr *sin_addr, const char *hostname) { - if (!inet_aton(hostname, sin_addr)) { + if (!ff_inet_aton(hostname, sin_addr)) { #if HAVE_GETADDRINFO struct addrinfo *ai, *cur; struct addrinfo hints; diff -r 6d4ba584fcf2 -r a292ef47e2f9 rtsp.c --- a/rtsp.c Sun Mar 07 08:52:53 2010 +0000 +++ b/rtsp.c Sun Mar 07 19:48:59 2010 +0000 @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* needed by inet_aton() */ -#define _SVID_SOURCE - #include "libavutil/base64.h" #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" @@ -359,7 +356,7 @@ if (strcmp(buf1, "IP4") != 0) return; get_word_sep(buf1, sizeof(buf1), "/", &p); - if (inet_aton(buf1, &sdp_ip) == 0) + if (ff_inet_aton(buf1, &sdp_ip) == 0) return; ttl = 16; if (*p == '/') { @@ -803,7 +800,7 @@ if (*p == '=') { p++; get_word_sep(buf, sizeof(buf), ";,", &p); - if (inet_aton(buf, &ipaddr)) + if (ff_inet_aton(buf, &ipaddr)) th->destination = ntohl(ipaddr.s_addr); } }