From c07740a7b83cb71b8db7fb7de23d6214c905b7aa Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Tue, 8 Oct 2019 12:42:52 +0100 Subject: [PATCH] arp: Fix an obvious typo and remove pragma Obvious typo is obvious and I feel pretty dumb right now.... --- src/arp.c | 9 +-------- src/common.h | 5 ----- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/arp.c b/src/arp.c index c9c84f56..33725211 100644 --- a/src/arp.c +++ b/src/arp.c @@ -134,7 +134,7 @@ static void arp_found(struct arp_state *astate, const struct arp_msg *amsg) { struct interface *ifp; - struct ivp4_addr *ia; + struct ipv4_addr *ia; #ifndef KERNEL_RFC5227 struct timespec now, defend; #endif @@ -142,15 +142,8 @@ arp_found(struct arp_state *astate, const struct arp_msg *amsg) arp_report_conflicted(astate, amsg); ifp = astate->iface; -#ifdef GCC_PRAGMA_GCC -#pragma GCC diagnostic push /* GCC is clearly wrong about this warning. */ -#pragma GCC diagnostic ignored "-Wincompatible-pointer-types" -#endif /* If we haven't added the address we're doing a probe. */ ia = ipv4_iffindaddr(ifp, &astate->addr, NULL); -#ifdef GCC_PRAGMA_GCC -#pragma GCC diagnostic pop -#endif if (ia == NULL) { if (astate->found_cb != NULL) astate->found_cb(astate, amsg); diff --git a/src/common.h b/src/common.h index 2a844234..4e8bcdea 100644 --- a/src/common.h +++ b/src/common.h @@ -190,11 +190,6 @@ # endif #endif -/* Older GCC does not support pragma GCC. */ -#if defined(__GNUC__) && __GNUC__ > 4 -#define GCC_PRAGMA_GCC -#endif - void get_line_free(void); extern int clock_monotonic; int get_monotonic(struct timespec *); -- 2.47.2