[Pkg-gnupg-commit] [gnupg2] 66/132: dirmngr: More fix for Windows.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 5af104b541ed430a54eb0163a1d29e1d043f9377
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Apr 13 09:52:19 2017 +0900

    dirmngr: More fix for Windows.
    
    * dirmngr/dns.c (socket_fd_t, STDCALL): New.
    (dns_te_initname): Use.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
---
 dirmngr/dns.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dirmngr/dns.c b/dirmngr/dns.c
index 9bba329..7a6202f 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))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git