arp: Fix an obvious typo and remove pragma

Obvious typo is obvious and I feel pretty dumb right now....

diff --git a/src/arp.c b/src/arp.c
index c9c84f5618d0375b06e39bf0a92fbc83cfcb7e06..337252117ab5d85ef8d5aa8f703f22017287d7af 100644 (file)
--- 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 2a844234fabc337307d1156331849e20c6245188..4e8bcdead667a67b1a5ef7fd091d035837996533 100644 (file)
--- 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 *);