[vlc-commits] Revert "network/io.c: minor fix"

[Jean-Baptiste Kempf]

vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Apr 18 10:28:10 2012 +0200| [f33b24f49b19c55d1acb4474aa822ab89e6fc472] | committer: Jean-Baptiste Kempf

Revert "network/io.c: minor fix"

This reverts commit d6b589b131c993b96bdb17bd5d41cb36637a76e9.

This broke mmsh radios

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=f33b24f49b19c55d1acb4474aa822ab89e6fc472
---

 src/network/io.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/network/io.c b/src/network/io.c
index 90ceffe..b4b4196 100644
--- a/src/network/io.c
+++ b/src/network/io.c
@@ -259,12 +259,9 @@ ssize_t
 net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs,
           void *restrict p_buf, size_t i_buflen, bool waitall)
 {
-#ifndef POLLRDHUP /* This is nice but non-portable */
-# define POLLRDHUP 0
-#endif
     size_t i_total = 0;
     struct pollfd ufd[2] = {
-        { .fd = fd,                           .events = POLLIN|POLLRDHUP },
+        { .fd = fd,                           .events = POLLIN },
         { .fd = vlc_object_waitpipe (p_this), .events = POLLIN },
     };
 
@@ -282,6 +279,9 @@ net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs,
             continue;
         }
 
+#ifndef POLLRDHUP /* This is nice but non-portable */
+# define POLLRDHUP 0
+#endif
         if (i_total > 0)
         {
             /* Errors (-1) and EOF (0) will be returned on next call,