| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From 0df5800cc2e720aad883a517f7d24a9722fe5845 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 20 Dec 2018 17:37:48 -0800 |
| 4 | Subject: [PATCH] Woverride-init is not needed with gcc 9 |
| 5 | |
| 6 | Fixes |
| 7 | | ../../gnupg-2.2.12/dirmngr/dns.h:525:16: error: lvalue required as |
| 8 | unary '&' operand | |
| 9 | 525 | dns_rr_i_init(&dns_quietinit((struct dns_rr_i){ 0, __VA_ARGS__ |
| 10 | }), (P)) |
| 11 | |
| 12 | Upstream-Status: Pending |
| 13 | |
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 15 | --- |
| 16 | dirmngr/dns.h | 2 +- |
| 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 18 | |
| 19 | diff --git a/dirmngr/dns.h b/dirmngr/dns.h |
| 20 | index 30d0b45..98fe412 100644 |
| 21 | --- a/dirmngr/dns.h |
| 22 | +++ b/dirmngr/dns.h |
| 23 | @@ -154,7 +154,7 @@ DNS_PUBLIC int *dns_debug_p(void); |
| 24 | |
| 25 | #define dns_quietinit(...) \ |
| 26 | DNS_PRAGMA_PUSH DNS_PRAGMA_QUIET __VA_ARGS__ DNS_PRAGMA_POP |
| 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") |