From: Guy Harris <guy@alum.mit.edu>
Date: Thu, 28 Nov 2013 19:49:44 +0000 (-0800)
Subject: Don't use __attribute__((format)) if it's not supported.
X-Git-Tag: tcpdump-4.6.0~329
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/557e637282f12aa5583ac394b8b012ab45577bfd?hp=7be1e976c946be21b8ca3b5a77efa21c32f2516f

Don't use __attribute__((format)) if it's not supported.

Also, *do* use it, if supported, for ndo_warning().
---

diff --git a/tcpdump.c b/tcpdump.c
index 739f9c8a..9e96daf9 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -129,8 +129,16 @@ static void dump_packet_and_trunc(u_char *, const struct pcap_pkthdr *, const u_
 static void dump_packet(u_char *, const struct pcap_pkthdr *, const u_char *);
 static void droproot(const char *, const char *);
 static void ndo_error(netdissect_options *ndo, const char *fmt, ...)
-     __attribute__ ((noreturn, format (printf, 2, 3)));
-static void ndo_warning(netdissect_options *ndo, const char *fmt, ...);
+     __attribute__((noreturn))
+#ifdef __ATTRIBUTE___FORMAT_OK
+     __attribute__((format (printf, 2, 3)))
+#endif /* __ATTRIBUTE___FORMAT_OK */
+    ;
+static void ndo_warning(netdissect_options *ndo, const char *fmt, ...)
+#ifdef __ATTRIBUTE___FORMAT_OK
+     __attribute__((format (printf, 2, 3)))
+#endif /* __ATTRIBUTE___FORMAT_OK */
+    ;
 
 #ifdef SIGNAL_REQ_INFO
 RETSIGTYPE requestinfo(int);