From 5af104b541ed430a54eb0163a1d29e1d043f9377 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 13 Apr 2017 09:52:19 +0900 Subject: [PATCH] dirmngr: More fix for Windows. * dirmngr/dns.c (socket_fd_t, STDCALL): New. (dns_te_initname): Use. Signed-off-by: NIIBE Yutaka --- dirmngr/dns.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dirmngr/dns.c b/dirmngr/dns.c index 9bba3290c..7a6202fe0 100644 --- a/dirmngr/dns.c +++ b/dirmngr/dns.c @@ -54,10 +54,14 @@ #endif #include #include +typedef SOCKET socket_fd_t; +#define STDCALL __stdcall #ifdef TIME_WITH_SYS_TIME #include /* gettimeofday(2) */ #endif #else +typedef int socket_fd_t; +#define STDCALL #include /* gettimeofday(2) */ #include /* FD_SETSIZE socklen_t */ #include /* FD_ZERO FD_SET fd_set select(2) */ @@ -4448,7 +4452,7 @@ struct dns_trace { } cnames; }; -static void dns_te_initname(struct sockaddr_storage *ss, int fd, int (*f)(int, struct sockaddr *, socklen_t *)) { +static void dns_te_initname(struct sockaddr_storage *ss, int fd, int (* STDCALL f)(socket_fd_t, struct sockaddr *, socklen_t *)) { socklen_t n = sizeof *ss; if (0 != f(fd, (struct sockaddr *)ss, &n))