[Mplayer-cvslog] CVS: main/libmpdemux network.c,1.73,1.74 network.h,1.15,1.16
Alex Beregszaszi
alex at mplayerhq.hu
Wed Apr 9 18:22:10 CEST 2003
Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv9012
Modified Files:
network.c network.h
Log Message:
removed some wrappers, now the configure checks for inet_pton. patch by Joey Parrish <joey at nicewarrior.org>
Index: network.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/network.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- network.c 30 Mar 2003 17:10:36 -0000 1.73
+++ network.c 9 Apr 2003 16:21:42 -0000 1.74
@@ -888,7 +888,11 @@
}
memcpy( (void*)&server_address.sin_addr.s_addr, (void*)hp->h_addr, hp->h_length );
} else {
+#ifdef USE_ATON
+ inet_aton(url->hostname, &server_address.sin_addr);
+#else
inet_pton(AF_INET, url->hostname, &server_address.sin_addr);
+#endif
}
server_address.sin_family=AF_INET;
server_address.sin_port=htons(url->port);
Index: network.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/network.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- network.h 29 Oct 2002 09:18:53 -0000 1.15
+++ network.h 9 Apr 2003 16:21:42 -0000 1.16
@@ -54,18 +54,4 @@
int http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry);
-/*
- * Joey Parrish <joey at yunamusic.com>:
- *
- * This define is to allow systems without inet_pton() to fallback on
- * inet_aton(). The difference between the two is that inet_aton() is
- * strictly for IPv4 networking, while inet_pton() is for IPv4 and IPv6
- * both. Slightly limited network functionality seems better than no
- * network functionality to me, and as all systems (Cygwin) start to
- * implement inet_pton(), configure will decide not to use this code.
- */
-#ifdef USE_ATON
-# define inet_pton(a, b, c) inet_aton(b, c)
-#endif
-
#endif
More information about the MPlayer-cvslog
mailing list