Commit f33b24f4 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Revert "network/io.c: minor fix"

This reverts commit d6b589b1.

This broke mmsh radios
parent 576ebf38
...@@ -259,12 +259,9 @@ ssize_t ...@@ -259,12 +259,9 @@ ssize_t
net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs, 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) 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; size_t i_total = 0;
struct pollfd ufd[2] = { struct pollfd ufd[2] = {
{ .fd = fd, .events = POLLIN|POLLRDHUP }, { .fd = fd, .events = POLLIN },
{ .fd = vlc_object_waitpipe (p_this), .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, ...@@ -282,6 +279,9 @@ net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs,
continue; continue;
} }
#ifndef POLLRDHUP /* This is nice but non-portable */
# define POLLRDHUP 0
#endif
if (i_total > 0) if (i_total > 0)
{ {
/* Errors (-1) and EOF (0) will be returned on next call, /* Errors (-1) and EOF (0) will be returned on next call,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment