diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-01 13:33:35 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-01 13:33:35 +0000 |
| commit | 3b222d68b0df4b3cc6d8271700703f495913b0ca (patch) | |
| tree | 30a6a22e70354009b2b77bbcc727a00cbda532c0 /stream | |
| parent | be5f5c7046f896ca16d7b4656c192f64c6d2e226 (diff) | |
| download | mpv-3b222d68b0df4b3cc6d8271700703f495913b0ca.tar.bz2 mpv-3b222d68b0df4b3cc6d8271700703f495913b0ca.tar.xz | |
HAVE_ATON --> HAVE_INET_ATON to match FFmpeg and give it a 0/1 value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28435 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/librtsp/rtsp_rtp.c | 4 | ||||
| -rw-r--r-- | stream/tcp.c | 4 | ||||
| -rw-r--r-- | stream/udp.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/stream/librtsp/rtsp_rtp.c b/stream/librtsp/rtsp_rtp.c index b782b59cd5..7dc8f6d32c 100644 --- a/stream/librtsp/rtsp_rtp.c +++ b/stream/librtsp/rtsp_rtp.c @@ -298,7 +298,7 @@ rtp_connect (char *hostname, int port) sin.sin_addr.s_addr = htonl (INADDR_ANY); else #ifndef HAVE_WINSOCK2_H -#ifdef HAVE_ATON +#if HAVE_INET_ATON inet_aton (hostname, &sin.sin_addr); #else inet_pton (AF_INET, hostname, &sin.sin_addr); @@ -387,7 +387,7 @@ is_multicast_address (char *addr) sin.sin_family = AF_INET; #ifndef HAVE_WINSOCK2_H -#ifdef HAVE_ATON +#if HAVE_INET_ATON inet_aton (addr, &sin.sin_addr); #else inet_pton (AF_INET, addr, &sin.sin_addr); diff --git a/stream/tcp.c b/stream/tcp.c index 69072f80fa..a47280739a 100644 --- a/stream/tcp.c +++ b/stream/tcp.c @@ -116,7 +116,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) { memset(&server_address, 0, sizeof(server_address)); #ifndef HAVE_WINSOCK2_H -#ifdef HAVE_ATON +#if HAVE_INET_ATON if (inet_aton(host, our_s_addr)!=1) #else 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; } -#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); #else inet_ntop(af, our_s_addr, buf, 255); diff --git a/stream/udp.c b/stream/udp.c index e7ac97f597..86fdc1941d 100644 --- a/stream/udp.c +++ b/stream/udp.c @@ -92,11 +92,11 @@ udp_open_socket (URL_t *url) else { #ifndef HAVE_WINSOCK2_H -#ifdef HAVE_ATON +#if HAVE_INET_ATON inet_aton (url->hostname, &server_address.sin_addr); #else inet_pton (AF_INET, url->hostname, &server_address.sin_addr); -#endif /* HAVE_ATON */ +#endif /* HAVE_INET_ATON */ #else server_address.sin_addr.s_addr = htonl(INADDR_ANY); #endif /* HAVE_WINSOCK2_H */ |