Revision ac11d562 libavformat/os_support.c

View differences:

libavformat/os_support.c
45 45
#include <stdlib.h>
46 46
#include <strings.h>
47 47

  
48
int inet_aton (const char * str, struct in_addr * add)
48
int ff_inet_aton (const char * str, struct in_addr * add)
49 49
{
50 50
    unsigned int add1 = 0, add2 = 0, add3 = 0, add4 = 0;
51 51

  
......
58 58

  
59 59
    return 1;
60 60
}
61
#else
62
int ff_inet_aton (const char * str, struct in_addr * add)
63
{
64
    return inet_aton(str, add);
65
}
61 66
#endif /* !HAVE_INET_ATON */
62 67

  
63 68
#if !HAVE_GETADDRINFO
......
85 90
    sin->sin_family = AF_INET;
86 91

  
87 92
    if (node) {
88
        if (!inet_aton(node, &sin->sin_addr)) {
93
        if (!ff_inet_aton(node, &sin->sin_addr)) {
89 94
            if (hints && (hints->ai_flags & AI_NUMERICHOST)) {
90 95
                av_free(sin);
91 96
                return EAI_FAIL;
......
221 226
int resolve_host(struct in_addr *sin_addr, const char *hostname)
222 227
{
223 228

  
224
    if (!inet_aton(hostname, sin_addr)) {
229
    if (!ff_inet_aton(hostname, sin_addr)) {
225 230
#if HAVE_GETADDRINFO
226 231
        struct addrinfo *ai, *cur;
227 232
        struct addrinfo hints;

Also available in: Unified diff