summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-07-06 21:29:09 -0700
committerGuy Harris <guy@alum.mit.edu>2014-07-07 04:29:41 +0000
commiteea2e156384f74320deb3f71bb22883d70de7681 (patch)
tree946d4d1f60f0174b4fcedff5051308ae28f6c6d8
parentaa4066dccfa763ebd5a8d0e224c753d977deee70 (diff)
downloadwireshark-eea2e156384f74320deb3f71bb22883d70de7681.tar.gz
G_GNUC_FORMAT encapsulates __attribute((format_arg(...))).
Change-Id: I9513c187ae4ce8b8cf8f6a926072b215e26ec64f Reviewed-on: https://code.wireshark.org/review/2907 Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r--epan/dissectors/packet-cip.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c
index 9e8a089b5b..5a9a8fdc9a 100644
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.c
@@ -3131,10 +3131,7 @@ attribute_info_t* cip_get_attribute(guint class_id, guint instance, guint attrib
static const char *
segment_name_format(const char *segment_name, const char *fmt)
-#if __GNUC__ >= 2
- __attribute__ ((format_arg (2)))
-#endif
-;
+ G_GNUC_FORMAT(2);
static const char *
segment_name_format(const char *segment_name, const char *fmt)