[git] GnuPG - branch, master, updated. gnupg-2.1.20-66-g5af104b

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  5af104b541ed430a54eb0163a1d29e1d043f9377 (commit)
      from  6755b3b505f79a5a233b18e85f57a0d3a455e664 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
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>

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))

-----------------------------------------------------------------------

Summary of changes:
 dirmngr/dns.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org