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

win32: Fix duplicate definitions in arpa-inet.h, arpa-inet.c, and poll.h

Browse source 
When _WIN32_WINNT >= 0x6000 (Vista), ws2tcpip.h provides inet_ntop and
inet_pton, and winsock2.h provides the equivalent of poll.h.

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/458>
This commit is contained in:
Patrick Gaskin 2021-01-03 04:07:05 -05:00 • committed by PulseAudio Marge Bot
parent 0edcf725bc
commit fc002e4dc6
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pulsecore/poll.h
View file

@ -24,6 +24,8 @@
#if defined(HAVE_POLL_H)
#include <poll.h>
#elif OS_IS_WIN32 && HAVE_WINSOCK2_H && NTDDI_VERSION >= NTDDI_VISTA
#include <winsock2.h>
#else
/* Event types that can be polled for. These bits may be set in `events'