blob: 83195b5bd4d3f72e1a84b824d354cf1b5cd4cfbb [file] [log] [blame]
Brad Bishopc342db32019-05-15 21:57:59 -04001From e3adc816d2d56dd929016073937ba24e01e03cb8 Mon Sep 17 00:00:00 2001
Brad Bishop19323692019-04-05 15:28:33 -04002From: 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
Brad Bishopc342db32019-05-15 21:57:59 -040020index 024d6dcc8..c6e141e16 100644
Brad Bishop19323692019-04-05 15:28:33 -040021--- a/dirmngr/dns.h
22+++ b/dirmngr/dns.h
Brad Bishopc342db32019-05-15 21:57:59 -040023@@ -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")
Brad Bishop19323692019-04-05 15:28:33 -040026
Brad Bishop19323692019-04-05 15:28:33 -040027-#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")
Brad Bishopc342db32019-05-15 21:57:59 -040032--
332.17.1
34