[MPlayer-cvslog] r28435 - in trunk: configure stream/librtsp/rtsp_rtp.c stream/tcp.c stream/udp.c

[diego]

Author: diego
Date: Sun Feb  1 14:33:35 2009
New Revision: 28435

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

Modified:
   trunk/configure
   trunk/stream/librtsp/rtsp_rtp.c
   trunk/stream/tcp.c
   trunk/stream/udp.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sun Feb  1 14:16:46 2009	(r28434)
+++ trunk/configure	Sun Feb  1 14:33:35 2009	(r28435)
@@ -2964,9 +2964,9 @@ EOF
   echores "$_use_aton"
 fi
 
-_def_use_aton='#undef HAVE_ATON'
+_def_inet_aton='#define HAVE_INET_ATON 0'
 if test "$_use_aton" = yes; then
-  _def_use_aton='#define HAVE_ATON 1'
+  _def_inet_aton='#define HAVE_INET_ATON 1'
 fi
 
 
@@ -8483,12 +8483,12 @@ $_def_fribidi
 $_def_closesocket
 $_def_ftp
 $_def_inet6
+$_def_inet_aton
 $_def_live
 $_def_nemesi
 $_def_network
 $_def_smb
 $_def_socklen_t
-$_def_use_aton
 $_def_vstream
 
 

Modified: trunk/stream/librtsp/rtsp_rtp.c
==============================================================================
--- trunk/stream/librtsp/rtsp_rtp.c	Sun Feb  1 14:16:46 2009	(r28434)
+++ trunk/stream/librtsp/rtsp_rtp.c	Sun Feb  1 14:33:35 2009	(r28435)
@@ -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);

Modified: trunk/stream/tcp.c
==============================================================================
--- trunk/stream/tcp.c	Sun Feb  1 14:16:46 2009	(r28434)
+++ trunk/stream/tcp.c	Sun Feb  1 14:33:35 2009	(r28435)
@@ -116,7 +116,7 @@ connect2Server_with_af(char *host, int p
 	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 p
 			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);

Modified: trunk/stream/udp.c
==============================================================================
--- trunk/stream/udp.c	Sun Feb  1 14:16:46 2009	(r28434)
+++ trunk/stream/udp.c	Sun Feb  1 14:33:35 2009	(r28435)
@@ -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 */