diff --git a/src/anchor.c b/src/anchor.c index 6872ab18..a5a31b2e 100644 --- a/src/anchor.c +++ b/src/anchor.c @@ -50,6 +50,7 @@ #include "gldns/keyraw.h" #include "general.h" #include "util-internal.h" +#include "platform.h" /* get key usage out of its extension, returns 0 if no key_usage extension */ static unsigned long diff --git a/src/context.c b/src/context.c index 9b43ff76..3456bfa0 100644 --- a/src/context.c +++ b/src/context.c @@ -80,6 +80,7 @@ typedef unsigned short in_port_t; #include "context.h" #include "types-internal.h" #include "util-internal.h" +#include "platform.h" #include "dnssec.h" #include "stub.h" #include "list.h" diff --git a/src/extension/poll_eventloop.c b/src/extension/poll_eventloop.c index b0793e7c..f6fdddda 100644 --- a/src/extension/poll_eventloop.c +++ b/src/extension/poll_eventloop.c @@ -28,6 +28,7 @@ #include "config.h" #include "util-internal.h" +#include "platform.h" #ifdef HAVE_SYS_RESOURCE_H #include #endif diff --git a/src/mdns.c b/src/mdns.c index 7578a262..30bdab6e 100644 --- a/src/mdns.c +++ b/src/mdns.c @@ -26,6 +26,7 @@ #include "gldns/pkthdr.h" #include "gldns/rrdef.h" #include "util-internal.h" +#include "platform.h" #include "mdns.h" #ifdef HAVE_MDNS_SUPPORT diff --git a/src/server.c b/src/server.c index 319991da..f29cb603 100644 --- a/src/server.c +++ b/src/server.c @@ -40,6 +40,7 @@ #include "debug.h" #include "util/rbtree.h" #include "util-internal.h" +#include "platform.h" #include "server.h" #define DNS_REQUEST_SZ 4096 diff --git a/src/stub.c b/src/stub.c index 5d472f72..ebcb2527 100644 --- a/src/stub.c +++ b/src/stub.c @@ -52,6 +52,7 @@ #include "rr-iter.h" #include "context.h" #include "util-internal.h" +#include "platform.h" #include "general.h" #include "pubkey-pinning.h" diff --git a/src/util-internal.h b/src/util-internal.h index faab07b0..3d768de1 100644 --- a/src/util-internal.h +++ b/src/util-internal.h @@ -218,46 +218,5 @@ INLINE uint64_t _getdns_ms_until_expiry2(uint64_t expires, uint64_t *now_ms) return *now_ms >= expires ? 0 : expires - *now_ms; } - -#ifdef USE_WINSOCK -typedef u_short sa_family_t; -#define _getdns_EAGAIN (WSATRY_AGAIN) -#define _getdns_EWOULDBLOCK (WSAEWOULDBLOCK) -#define _getdns_EINPROGRESS (WSAEINPROGRESS) -#define _getdns_EMFILE (WSAEMFILE) -#define _getdns_ECONNRESET (WSAECONNRESET) - -#define _getdns_closesocket(fd) closesocket(fd) -#define _getdns_poll(fdarray, nsockets, timer) WSAPoll(fdarray, nsockets, timer) -#define _getdns_socketerror() (WSAGetLastError()) -#else -#ifdef HAVE_SYS_POLL_H -# include -#else -# include -#endif - -#define _getdns_EAGAIN (EAGAIN) -#define _getdns_EWOULDBLOCK (EWOULDBLOCK) -#define _getdns_EINPROGRESS (EINPROGRESS) -#define _getdns_EMFILE (EMFILE) -#define _getdns_ECONNRESET (ECONNRESET) - -#define SOCKADDR struct sockaddr -#define SOCKADDR_IN struct sockaddr_in -#define SOCKADDR_IN6 struct sockaddr_in6 -#define SOCKADDR_STORAGE struct sockaddr_storage -#define SOCKET int - -#define IP_MREQ struct ip_mreq -#define IPV6_MREQ struct ipv6_mreq -#define BOOL int -#define TRUE 1 - -#define _getdns_closesocket(fd) close(fd) -#define _getdns_poll(fdarray, nsockets, timer) poll(fdarray, nsockets, timer) -#define _getdns_socketerror() (errno) -#endif - #endif /* util-internal.h */