Merge branch 'master' of git://git.videolan.org/vlc

[vlc] / include / vlc_network.h

diff --git a/include/vlc_network.h b/include/vlc_network.h
index aca2b0a70498e9c721bae34ac3660a30e935d008..dbe7f205a704dbdb3e9fd16da0f651f8c6ef3c3a 100644 (file)
--- a/include/vlc_network.h
+++ b/include/vlc_network.h
@@ -24,8 +24,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef __VLC_NETWORK_H
-# define __VLC_NETWORK_H
+#ifndef VLC_NETWORK_H
+# define VLC_NETWORK_H
+
+/**
+ * \file
+ * This file defines interface to communicate with network plug-ins
+ */
 
 #if defined( WIN32 )
 #   if !defined(UNDER_CE)
@@ -102,8 +107,9 @@ static inline int __net_ConnectTCP (vlc_object_t *obj, const char *host, int por
 
 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 ) );
+#define net_Accept(a, b, c) \
+      __net_Accept(VLC_OBJECT(a), b, (c == -1) ? -1 : (c ? check_delay(c) : 0))
 
 #define net_ConnectDgram(a, b, c, d, e ) __net_ConnectDgram(VLC_OBJECT(a), b, c, d, e)
 VLC_EXPORT( int, __net_ConnectDgram, ( vlc_object_t *p_this, const char *psz_host, int i_port, int hlim, int proto ) );
@@ -180,9 +186,11 @@ struct pollfd
     int events;
     int revents;
 };
-
-  VLC_EXPORT (int, poll, (struct pollfd *fds, unsigned nfds, int timeout));
+# define poll(a, b, c) vlc_poll(a, b, c)
 #endif
+struct pollfd;
+VLC_EXPORT (int, vlc_poll, (struct pollfd *fds, unsigned nfds, int timeout));
+
 
 #ifdef WIN32
 /* Microsoft: same semantic, same value, different name... go figure */