mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

HAVE_ATON --> HAVE_INET_ATON to match FFmpeg and give it a 0/1 value.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28435 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2009-02-01 13:33:35 +00:00
parent be5f5c7046
commit 3b222d68b0
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -2964,9 +2964,9 @@ EOF
echores "$_use_aton" echores "$_use_aton"
fi fi
_def_use_aton='#undef HAVE_ATON' _def_inet_aton='#define HAVE_INET_ATON 0'
if test "$_use_aton" = yes; then if test "$_use_aton" = yes; then
_def_use_aton='#define HAVE_ATON 1' _def_inet_aton='#define HAVE_INET_ATON 1'
fi fi
@ -8483,12 +8483,12 @@ $_def_fribidi
$_def_closesocket $_def_closesocket
$_def_ftp $_def_ftp
$_def_inet6 $_def_inet6
$_def_inet_aton
$_def_live $_def_live
$_def_nemesi $_def_nemesi
$_def_network $_def_network
$_def_smb $_def_smb
$_def_socklen_t $_def_socklen_t
$_def_use_aton
$_def_vstream $_def_vstream

4
stream/librtsp/rtsp_rtp.c
View File

@ -298,7 +298,7 @@ rtp_connect (char *hostname, int port)
sin.sin_addr.s_addr = htonl (INADDR_ANY); sin.sin_addr.s_addr = htonl (INADDR_ANY);
else else
#ifndef HAVE_WINSOCK2_H #ifndef HAVE_WINSOCK2_H
#ifdef HAVE_ATON #if HAVE_INET_ATON
inet_aton (hostname, &sin.sin_addr); inet_aton (hostname, &sin.sin_addr);
#else #else
inet_pton (AF_INET, hostname, &sin.sin_addr); inet_pton (AF_INET, hostname, &sin.sin_addr);
@ -387,7 +387,7 @@ is_multicast_address (char *addr)
sin.sin_family = AF_INET; sin.sin_family = AF_INET;
#ifndef HAVE_WINSOCK2_H #ifndef HAVE_WINSOCK2_H
#ifdef HAVE_ATON #if HAVE_INET_ATON
inet_aton (addr, &sin.sin_addr); inet_aton (addr, &sin.sin_addr);
#else #else
inet_pton (AF_INET, addr, &sin.sin_addr); inet_pton (AF_INET, addr, &sin.sin_addr);

4
stream/tcp.c
View File

@ -116,7 +116,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
memset(&server_address, 0, sizeof(server_address)); memset(&server_address, 0, sizeof(server_address));
#ifndef HAVE_WINSOCK2_H #ifndef HAVE_WINSOCK2_H
#ifdef HAVE_ATON #if HAVE_INET_ATON
if (inet_aton(host, our_s_addr)!=1) if (inet_aton(host, our_s_addr)!=1)
#else #else
if (inet_pton(af, host, our_s_addr)!=1) if (inet_pton(af, host, our_s_addr)!=1)
@ -164,7 +164,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
return TCP_ERROR_FATAL; return TCP_ERROR_FATAL;
} }
#if defined(HAVE_ATON) || defined(HAVE_WINSOCK2_H) #if HAVE_INET_ATON || defined(HAVE_WINSOCK2_H)
strncpy( buf, inet_ntoa( *((struct in_addr*)our_s_addr) ), 255); strncpy( buf, inet_ntoa( *((struct in_addr*)our_s_addr) ), 255);
#else #else
inet_ntop(af, our_s_addr, buf, 255); inet_ntop(af, our_s_addr, buf, 255);

4
stream/udp.c
View File

@ -92,11 +92,11 @@ udp_open_socket (URL_t *url)
else else
{ {
#ifndef HAVE_WINSOCK2_H #ifndef HAVE_WINSOCK2_H
#ifdef HAVE_ATON #if HAVE_INET_ATON
inet_aton (url->hostname, &server_address.sin_addr); inet_aton (url->hostname, &server_address.sin_addr);
#else #else
inet_pton (AF_INET, url->hostname, &server_address.sin_addr); inet_pton (AF_INET, url->hostname, &server_address.sin_addr);
#endif /* HAVE_ATON */ #endif /* HAVE_INET_ATON */
#else #else
server_address.sin_addr.s_addr = htonl(INADDR_ANY); server_address.sin_addr.s_addr = htonl(INADDR_ANY);
#endif /* HAVE_WINSOCK2_H */ #endif /* HAVE_WINSOCK2_H */