[git] GnuPG - branch, master, updated. gnupg-2.1.17-66-g97372b3

[by Werner Koch]

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  97372b39cd9b4c84a083eadbf072fff77799617f (commit)
       via  0fadff9cdde47e42f7e428bc903b3626c67ba9c0 (commit)
      from  20dfcfe08c618d23134d5d6efef7676b090f30d3 (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 97372b39cd9b4c84a083eadbf072fff77799617f
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jan 12 09:22:14 2017 +0100

    libdns: Silence -Wstrict-prototypes on some function ptrs.
    
    * dirmngr/dns.c (dns_rrtype): Ignore -Wstrict-prototypes warning.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/dns.c b/dirmngr/dns.c
index b580e40..016ff44 100644
--- a/dirmngr/dns.c
+++ b/dirmngr/dns.c
@@ -4246,6 +4246,15 @@ size_t dns_txt_print(void *_dst, size_t lim, struct dns_txt *txt) {
 } /* dns_txt_print() */
 
 
+/* Some of the function pointers of DNS_RRTYPES are initialized with
+ * slighlly different fucntions, thus we can't use prototypes.  */
+DNS_PRAGMA_PUSH
+#if __clang__
+#pragma clang diagnostic ignored "-Wstrict-prototypes"
+#elif DNS_GNUC_PREREQ(4,6,0)
+#pragma GCC   diagnostic ignored "-Wstrict-prototypes"
+#endif
+
 static const struct dns_rrtype {
 	enum dns_type type;
 	const char *name;
@@ -4271,6 +4280,10 @@ static const struct dns_rrtype {
 	{ DNS_T_AXFR,   "AXFR",   0,                 0,                 0,                0,               0,                 0,                },
 }; /* dns_rrtypes[] */
 
+DNS_PRAGMA_POP  /*(-Wstrict-prototypes)*/
+
+
+
 static const struct dns_rrtype *dns_rrtype(enum dns_type type) {
 	const struct dns_rrtype *t;
 

commit 0fadff9cdde47e42f7e428bc903b3626c67ba9c0
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jan 12 09:20:49 2017 +0100

    libdns: Provide replacement for EPROTO.
    
    * dirmngr/dns.c (EPROTO) ![EPROTO]: Define to EPROTONOSUPPORT.
    --
    
    This is the same replacement we use in Libassuan
    (commit 8ab3b9273524bd344bdb90dd5d3bc8e5f53ead6e) to make it work on
    OpenBSD and may other BSD based OSes.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/dns.c b/dirmngr/dns.c
index 4b61b72..b580e40 100644
--- a/dirmngr/dns.c
+++ b/dirmngr/dns.c
@@ -288,6 +288,10 @@ int dns_v_api(void) {
  *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+#ifndef EPROTO
+# define EPROTO EPROTONOSUPPORT
+#endif
+
 #if _WIN32
 
 #define DNS_EINTR	WSAEINTR

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

Summary of changes:
 dirmngr/dns.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)


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