Changeset 45d6d7723effc208a4291fb59eb38fe47aec3fc3

Show
Ignore:
Timestamp:
03/03/07 12:51:32 (2 years ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1172922692 +0000
git-parent:

[ab1251ee872eb9e08d529857344f808226e84f46]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1172922692 +0000
Message:

Fix linking.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/network/getaddrinfo.c

    re90520e r45d6d77  
    568568    } 
    569569 
    570 #if defined (HAVE_GETNAMEINFO) 
     570#ifndef WIN32 
    571571    i_val = getnameinfo(sa, salen, host, hostlen, psz_serv, i_servlen, flags); 
    572 #elif defined (WIN32) 
     572#else 
    573573    i_val = ws2_getnameinfo (sa, salen, host, hostlen, psz_serv, i_servlen, flags); 
    574 #else 
    575     i_val = __getnameinfo (sa, salen, host, hostlen, psz_serv, i_servlen, flags); 
    576574#endif 
    577575 
    …… 
    583581 
    584582 
    585 /* TODO: support for setting sin6_scope_id */ 
    586583int vlc_getaddrinfo( vlc_object_t *p_this, const char *node, 
    587584                     int i_port, const struct addrinfo *p_hints, 
    …… 
    658655    /* 
    659656     * Winsock tries to resolve numerical IPv4 addresses as AAAA 
    660      * and IPv6 addresses as A... There comes the work around. 
     657     * and IPv6 addresses as A... There comes the bug-to-bug fix. 
    661658     */ 
    662659    if ((hints.ai_flags & AI_NUMERICHOST) == 0) 
    …… 
    700697    vlc_mutex_lock (lock.p_address); 
    701698 
    702     int ret = __getaddrinfo (psz_node, psz_service, &hints, res); 
     699    int ret = getaddrinfo (psz_node, psz_service, &hints, res); 
    703700    vlc_mutex_unlock (lock.p_address); 
    704701    return ret; 
    …… 
    709706void vlc_freeaddrinfo( struct addrinfo *infos ) 
    710707{ 
    711 #if defined (HAVE_GETADDRINFO) 
     708#ifndef WIN32 
    712709    freeaddrinfo (infos); 
    713 #elif defined (WIN32) 
     710#else 
    714711    ws2_freeaddrinfo (infos); 
    715 #else 
    716     __freeaddrinfo( infos ); 
    717 #endif 
    718 } 
     712#endif 
     713}