diff options
| -rw-r--r-- | libmpdemux/network.c | 4 | ||||
| -rw-r--r-- | libmpdemux/network.h | 14 |
2 files changed, 4 insertions, 14 deletions
diff --git a/libmpdemux/network.c b/libmpdemux/network.c index ed80d65a98..3a9eaad478 100644 --- a/libmpdemux/network.c +++ b/libmpdemux/network.c @@ -888,7 +888,11 @@ rtp_open_socket( URL_t *url ) { } 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); diff --git a/libmpdemux/network.h b/libmpdemux/network.h index 7ab436d7ab..e83b15c0ab 100644 --- a/libmpdemux/network.h +++ b/libmpdemux/network.h @@ -54,18 +54,4 @@ HTTP_header_t *http_read_response(int fd); int http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry); -/* - * Joey Parrish <joey@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 |