From: Roy Marples <roy@marples.name>
Date: Tue, 1 Oct 2019 16:21:00 +0000 (+0100)
Subject: gcc: Compile with older GCC again.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c2ff3a91df39e54e1cc8bb3bc4f2684fdf6523d;p=thirdparty%2Fdhcpcd.git

gcc: Compile with older GCC again.
---

diff --git a/src/arp.c b/src/arp.c
index 49393f5a..c9c84f56 100644
--- a/src/arp.c
+++ b/src/arp.c
@@ -142,11 +142,15 @@ 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 4e8bcdea..bef56958 100644
--- a/src/common.h
+++ b/src/common.h
@@ -190,6 +190,11 @@
 # endif
 #endif
 
+/* Older GCC does not support pragma GCC. */
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 5))
+#define GCC_PRAGMA_GCC
+#endif
+
 void get_line_free(void);
 extern int clock_monotonic;
 int get_monotonic(struct timespec *);