fix jvlc arguments

[vlc] / include / vlc_network.h

diff --git a/include/vlc_network.h b/include/vlc_network.h
index d03a9243d4f74cc63b3acffe6e1d96ce874daa93..82ae3840241fae72e3ece40c4f41043ce93a455d 100644 (file)
--- a/include/vlc_network.h
+++ b/include/vlc_network.h
@@ -32,12 +32,7 @@
 # define __VLC_NETWORK_H
 
 #if defined( WIN32 )
-#   if defined(UNDER_CE) && defined(sockaddr_storage)
-#       undef sockaddr_storage
-#   endif
-#   if defined(UNDER_CE)
-#       define HAVE_STRUCT_ADDRINFO
-#   else
+#   if !defined(UNDER_CE)
 #       define _NO_OLDNAMES 1
 #       include <io.h>
 #   endif
@@ -50,13 +45,11 @@ extern const char *net_strerror( int val );
 #       define IPV6_V6ONLY 27
 #   endif
 #else
-#   if HAVE_SYS_SOCKET_H
-#      include <sys/socket.h>
-#   endif
-#   if HAVE_NETINET_IN_H
+#   include <sys/socket.h>
+#   ifdef HAVE_NETINET_IN_H
 #      include <netinet/in.h>
 #   endif
-#   if HAVE_ARPA_INET_H
+#   ifdef HAVE_ARPA_INET_H
 #      include <arpa/inet.h>
 #   elif defined( SYS_BEOS )
 #      include <net/netdb.h>
@@ -86,6 +79,9 @@ static inline int __net_ConnectTCP (vlc_object_t *obj, const char *host, int por
     return __net_Connect (obj, host, port, SOCK_STREAM, IPPROTO_TCP);
 }
 
+
+VLC_EXPORT( int, net_AcceptSingle, (vlc_object_t *obj, int lfd) );
+
 #define net_Accept(a, b, c) __net_Accept(VLC_OBJECT(a), b, c)
 VLC_EXPORT( int, __net_Accept, ( vlc_object_t *, int *, mtime_t ) );
 
@@ -290,34 +286,6 @@ net_SockAddrIsMulticast (const struct sockaddr *addr, socklen_t len)
 }
 
 
-
-/**
- * net_AddressIsMulticast
- * @return VLC_FALSE iff the psz_addr does not specify a multicast address,
- * or the address is not a valid address.
- */
-static inline vlc_bool_t net_AddressIsMulticast( vlc_object_t *p_object, const char *psz_addr )
-{
-    struct addrinfo hints, *res;
-
-    memset (&hints, 0, sizeof (hints));
-    hints.ai_socktype = SOCK_DGRAM; /* UDP */
-    hints.ai_flags = AI_NUMERICHOST;
-
-    int i = vlc_getaddrinfo (p_object, psz_addr, 0,
-                             &hints, &res);
-    if (i)
-    {
-        msg_Err (p_object, "invalid address \"%s\" for net_AddressIsMulticast (%s)",
-                 psz_addr, vlc_gai_strerror (i));
-        return VLC_FALSE;
-    }
-
-    vlc_bool_t b = net_SockAddrIsMulticast (res->ai_addr, res->ai_addrlen);
-    vlc_freeaddrinfo (res);
-    return b;
-}
-
 static inline int net_GetSockAddress( int fd, char *address, int *port )
 {
     struct sockaddr_storage addr;