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

6
src/pulsecore/arpa-inet.h
View file

@ -8,10 +8,12 @@
#elif defined(OS_IS_WIN32)
/* On Windows winsock2.h (here included via pulsecore/socket.h) provides most of the functionality of arpa/inet.h, except for
* the inet_ntop and inet_pton functions, which are implemented here. */
* the inet_ntop and inet_pton functions, which are implemented here on versions earlier than Vista. */
#include <pulsecore/socket.h>
#if NTDDI_VERSION < NTDDI_VISTA
const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt);
int inet_pton(int af, const char *src, void *dst);
@ -19,3 +21,5 @@ int inet_pton(int af, const char *src, void *dst);
#endif
#endif
#endif