mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-08 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use <pulsecore/socket.h> instead of <sys/socket.h>

Browse source 
The check whether POSIX socket.h or WIN32 winsock2.h must be included can be
made centrally.  The downside is that some functionality of e.g. arpa/inet.h is
also implemented in winsock.h, so that some files that don't use socket
functions, but do use inet.h functions, must also include pulsecore/socket.h.
(as well as arpa/inet.h)
This commit is contained in:
Maarten Bosmans 2011-01-04 17:03:13 +01:00
parent d6d9fb295d
commit 4f1d4044f8
30 changed files with 52 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pulsecore/poll.c
View file

@ -45,8 +45,7 @@
#include <sys/select.h>
#endif
#include "winsock.h"
#include <pulsecore/socket.h>
#include <pulsecore/core-util.h>
#include <pulse/util.h>
@ -187,11 +186,11 @@ int pa_poll (struct pollfd *fds, unsigned long int nfds, int timeout) {
* connected socket, a server socket, or something else using a
* 0-byte recv, and use ioctl(2) to detect POLLHUP. */
r = recv(f->fd, NULL, 0, MSG_PEEK);
if (r == 0 || (r < 0 && errno == ENOTSOCK))
ioctl(f->fd, FIONREAD, &r);
if (r == 0 || (r < 0 && errno == ENOTSOCK))
ioctl(f->fd, FIONREAD, &r);
if (r == 0)
f->revents |= POLLHUP;
if (r == 0)
f->revents |= POLLHUP;
#else /* !OS_IS_DARWIN */
if (recv (f->fd, data, 64, MSG_PEEK) == -1) {
if (errno == ESHUTDOWN || errno == ECONNRESET ||