Mercurial > mplayer.hg

diff stream/tcp.c @ 28400:9202b9245819

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
HAVE_ATON --> HAVE_INET_ATON to match FFmpeg and give it a 0/1 value.
author diego
date Sun, 01 Feb 2009 13:33:35 +0000
parents f1be9f91cbd8
children c884d17bd005
line wrap: on
line diff
--- a/stream/tcp.c	Sun Feb 01 13:16:46 2009 +0000
+++ b/stream/tcp.c	Sun Feb 01 13:33:35 2009 +0000
@@ -116,7 +116,7 @@
 	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 @@
 			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);