diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-05-18 14:41:26 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-05-18 22:31:05 +0000 |
| commit | b1de8c87a12ea431e45e86dea85546948937e21e (patch) | |
| tree | b4ade80a03f7d39a774bc04756f272c5f18e23ec /plugins | |
| parent | 1a4f65c4a31d7366f2e4d3fee62bf05105fd0ebf (diff) | |
Older versions of Clang don't understand -Wpedantic.
Define DIAG_OFF_PEDANTIC and DIAG_ON_PEDANTIC, and have it do nothing on
Clang prior to 4.0.
Change-Id: Ic6b2e607659db66f3210401024bf3f2239665506
Reviewed-on: https://code.wireshark.org/review/27649
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/epan/ethercat/packet-ecatmb.h | 4 | ||||
| -rw-r--r-- | plugins/epan/ethercat/packet-ethercat-frame.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/epan/ethercat/packet-ecatmb.h b/plugins/epan/ethercat/packet-ecatmb.h index 8e481c0e64..fd3ce48b50 100644 --- a/plugins/epan/ethercat/packet-ecatmb.h +++ b/plugins/epan/ethercat/packet-ecatmb.h @@ -12,7 +12,7 @@ #define _PACKET_ECATMAILBOX_H_ #include <ws_diag_control.h> -DIAG_OFF(pedantic) +DIAG_OFF_PEDANTIC /* Ensure the same data layout for all platforms */ @@ -467,5 +467,5 @@ typedef struct TETHERCAT_SOE_HEADER extern void init_mbx_header(PETHERCAT_MBOX_HEADER pMbox, tvbuff_t *tvb, gint offset); -DIAG_ON(pedantic) +DIAG_ON_PEDANTIC #endif /* _PACKET_ECATMAILBOX_H_ */ diff --git a/plugins/epan/ethercat/packet-ethercat-frame.h b/plugins/epan/ethercat/packet-ethercat-frame.h index 96181f3204..2bb8c19b03 100644 --- a/plugins/epan/ethercat/packet-ethercat-frame.h +++ b/plugins/epan/ethercat/packet-ethercat-frame.h @@ -14,7 +14,7 @@ #include <ws_diag_control.h> /* structure for decoding the header -----------------------------------------*/ -DIAG_OFF(pedantic) +DIAG_OFF_PEDANTIC typedef union _EtherCATFrameParser { struct @@ -25,7 +25,7 @@ typedef union _EtherCATFrameParser } v; guint16 hdr; } EtherCATFrameParserHDR; -DIAG_ON(pedantic) +DIAG_ON_PEDANTIC typedef EtherCATFrameParserHDR *PEtherCATFrameParserHDR; #define EtherCATFrameParserHDR_Len (int)sizeof(EtherCATFrameParserHDR) |