1From bbf09a439d56ddcae6f641c8f1cf7544e3dd4d6f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 20 Dec 2018 17:37:48 -0800
4Subject: [PATCH] Woverride-init is not needed with gcc 9
5
6Fixes
7| ../../gnupg-2.2.12/dirmngr/dns.h:525:16: error: lvalue required as
8unary '&' operand                                                 |
9525 |  dns_rr_i_init(&dns_quietinit((struct dns_rr_i){ 0, __VA_ARGS__
10}), (P))
11
12Upstream-Status: Pending
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 dirmngr/dns.h | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/dirmngr/dns.h b/dirmngr/dns.h
20index 1f647e1..334acb6 100644
21--- a/dirmngr/dns.h
22+++ b/dirmngr/dns.h
23@@ -139,7 +139,7 @@ DNS_PUBLIC int *dns_debug_p(void);
24 #define DNS_PRAGMA_QUIET _Pragma("clang diagnostic ignored \"-Winitializer-overrides\"")
25 #define DNS_PRAGMA_POP _Pragma("clang diagnostic pop")
26
27-#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4
28+#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || (__GNUC__ > 4 && __GNUC__ < 9)
29 #define DNS_PRAGMA_PUSH _Pragma("GCC diagnostic push")
30 #define DNS_PRAGMA_QUIET _Pragma("GCC diagnostic ignored \"-Woverride-init\"")
31 #define DNS_PRAGMA_POP _Pragma("GCC diagnostic pop")
32