Twolame: fix copyright header, and remove unnecessary includes

[vlc] / include / vlc_network.h

diff --git a/include/vlc_network.h b/include/vlc_network.h
index d00b9079c115ff0e75dbfb55cff9eb3c269bb26d..f145312ad8c7132b203c68818d8188743dbf35fc 100644 (file)
--- a/include/vlc_network.h
+++ b/include/vlc_network.h
@@ -85,10 +85,10 @@ struct msghdr
 #   undef IPV6_JOIN_GROUP
 #endif
 
-int vlc_socket (int, int, int, bool nonblock) LIBVLC_USED;
+int vlc_socket (int, int, int, bool nonblock) VLC_USED;
 
 struct sockaddr;
-VLC_API int vlc_accept( int, struct sockaddr *, socklen_t *, bool ) LIBVLC_USED;
+VLC_API int vlc_accept( int, struct sockaddr *, socklen_t *, bool ) VLC_USED;
 
 # ifdef __cplusplus
 extern "C" {
@@ -126,13 +126,13 @@ static inline int net_ConnectUDP (vlc_object_t *obj, const char *host, int port,
     return net_ConnectDgram (obj, host, port, hlim, IPPROTO_UDP);
 }
 
-VLC_API int net_OpenDgram( vlc_object_t *p_this, const char *psz_bind, int i_bind, const char *psz_server, int i_server, int family, int proto );
-#define net_OpenDgram( a, b, c, d, e, g, h ) \
-        net_OpenDgram(VLC_OBJECT(a), b, c, d, e, g, h)
+VLC_API int net_OpenDgram( vlc_object_t *p_this, const char *psz_bind, int i_bind, const char *psz_server, int i_server, int proto );
+#define net_OpenDgram( a, b, c, d, e, g ) \
+        net_OpenDgram(VLC_OBJECT(a), b, c, d, e, g)
 
 static inline int net_ListenUDP1 (vlc_object_t *obj, const char *host, int port)
 {
-    return net_OpenDgram (obj, host, port, NULL, 0, 0, IPPROTO_UDP);
+    return net_OpenDgram (obj, host, port, NULL, 0, IPPROTO_UDP);
 }
 
 VLC_API void net_ListenClose( int *fd );
@@ -146,8 +146,8 @@ VLC_API int net_SetCSCov( int fd, int sendcov, int recvcov );
 struct virtual_socket_t
 {
     void *p_sys;
-    int (*pf_recv) ( void *, void *, int );
-    int (*pf_send) ( void *, const void *, int );
+    int (*pf_recv) ( void *, void *, size_t );
+    int (*pf_send) ( void *, const void *, size_t );
 };
 
 VLC_API ssize_t net_Read( vlc_object_t *p_this, int fd, const v_socket_t *, void *p_data, size_t i_data, bool b_retry );
@@ -158,7 +158,7 @@ VLC_API char * net_Gets( vlc_object_t *p_this, int fd, const v_socket_t * );
 #define net_Gets(a,b,c) net_Gets(VLC_OBJECT(a),b,c)
 
 
-VLC_API ssize_t net_Printf( vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, ... ) LIBVLC_FORMAT( 4, 5 );
+VLC_API ssize_t net_Printf( vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, ... ) VLC_FORMAT( 4, 5 );
 #define net_Printf(o,fd,vs,...) net_Printf(VLC_OBJECT(o),fd,vs, __VA_ARGS__)
 VLC_API ssize_t net_vaPrintf( vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, va_list args );
 #define net_vaPrintf(a,b,c,d,e) net_vaPrintf(VLC_OBJECT(a),b,c,d,e)
@@ -177,6 +177,11 @@ VLC_API int vlc_poll(struct pollfd *fds, unsigned nfds, int timeout);
 # define SHUT_RDWR SD_BOTH
 # define net_Close( fd ) closesocket ((SOCKET)fd)
 #else
+# ifdef __OS2__
+#  define SHUT_RD    0
+#  define SHUT_WR    1
+#  define SHUT_RDWR  2
+# endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif