diff options
| author | David Conrad <lessen42@gmail.com> | 2010-03-07 19:48:59 +0000 |
|---|---|---|
| committer | David Conrad <lessen42@gmail.com> | 2010-03-07 19:48:59 +0000 |
| commit | ac11d562e51a7764abc20447303ce95225d07a0b (patch) | |
| tree | a56482abec9b273fdb94c0f171faec90777eacb4 /libavformat | |
| parent | d1be963568824306ac8f826a89df98761f89c0e2 (diff) | |
Localize the #define _SVID_SOURCE needed for inet_aton() to os_support.c
Originally committed as revision 22284 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/network.h | 5 | ||||
| -rw-r--r-- | libavformat/os_support.c | 11 | ||||
| -rw-r--r-- | libavformat/rtsp.c | 7 |
3 files changed, 11 insertions, 12 deletions
diff --git a/libavformat/network.h b/libavformat/network.h index 796d44ae5f..53bb9c07c7 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -63,10 +63,7 @@ static inline void ff_network_close(void) #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 --git a/libavformat/os_support.c b/libavformat/os_support.c index 4bf2e268cf..d9b6c1ed69 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -45,7 +45,7 @@ #include <stdlib.h> #include <strings.h> -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 @@ int inet_aton (const char * str, struct in_addr * add) 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 @@ int ff_getaddrinfo(const char *node, const char *service, 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 @@ const char *ff_gai_strerror(int ecode) 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 --git a/libavformat/rtsp.c b/libavformat/rtsp.c index c7c6fc3422..60f13275e5 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -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 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, 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 @@ static void rtsp_parse_transport(RTSPMessageHeader *reply, const char *p) 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); } } |