diff options
| author | NIIBE Yutaka <[email protected]> | 2017-04-13 00:52:19 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2017-04-13 00:52:19 +0000 |
| commit | 5af104b541ed430a54eb0163a1d29e1d043f9377 (patch) | |
| tree | 1d6d30cabe27e39893395b88f1f4a521d86c256e | |
| parent | dirmngr: Fix type of sock. (diff) | |
| download | gnupg-5af104b541ed430a54eb0163a1d29e1d043f9377.tar.gz gnupg-5af104b541ed430a54eb0163a1d29e1d043f9377.zip | |
dirmngr: More fix for Windows.
* dirmngr/dns.c (socket_fd_t, STDCALL): New.
(dns_te_initname): Use.
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | dirmngr/dns.c | 6 |
1 files changed, 5 insertions, 1 deletions
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 <winsock2.h> #include <ws2tcpip.h> +typedef SOCKET socket_fd_t; +#define STDCALL __stdcall #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> /* gettimeofday(2) */ #endif #else +typedef int socket_fd_t; +#define STDCALL #include <sys/time.h> /* gettimeofday(2) */ #include <sys/types.h> /* FD_SETSIZE socklen_t */ #include <sys/select.h> /* 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)) |