aboutsummaryrefslogtreecommitdiffstats
path: root/caputils
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2018-05-18 14:41:26 -0700
committerGuy Harris <guy@alum.mit.edu>2018-05-18 22:31:05 +0000
commitb1de8c87a12ea431e45e86dea85546948937e21e (patch)
treeb4ade80a03f7d39a774bc04756f272c5f18e23ec /caputils
parent1a4f65c4a31d7366f2e4d3fee62bf05105fd0ebf (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 'caputils')
-rw-r--r--caputils/iface_monitor.c8
-rw-r--r--caputils/ws80211_utils.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/caputils/iface_monitor.c b/caputils/iface_monitor.c
index 66372e6a38..5694abca1e 100644
--- a/caputils/iface_monitor.c
+++ b/caputils/iface_monitor.c
@@ -25,13 +25,13 @@
#include <string.h>
#include <errno.h>
-DIAG_OFF(pedantic)
+DIAG_OFF_PEDANTIC
#include <netlink/msg.h>
-DIAG_ON(pedantic)
+DIAG_ON_PEDANTIC
#include <netlink/attr.h>
-DIAG_OFF(pedantic)
+DIAG_OFF_PEDANTIC
#include <netlink/route/link.h>
-DIAG_ON(pedantic)
+DIAG_ON_PEDANTIC
#ifndef IFF_UP
/*
diff --git a/caputils/ws80211_utils.c b/caputils/ws80211_utils.c
index ac03bb4046..265baa6ebe 100644
--- a/caputils/ws80211_utils.c
+++ b/caputils/ws80211_utils.c
@@ -29,14 +29,14 @@ SPDX-License-Identifier: ISC
#include <net/if.h>
#include <sys/ioctl.h>
-DIAG_OFF(pedantic)
+DIAG_OFF_PEDANTIC
#include <netlink/genl/genl.h>
-DIAG_ON(pedantic)
+DIAG_ON_PEDANTIC
#include <netlink/genl/family.h>
#include <netlink/genl/ctrl.h>
-DIAG_OFF(pedantic)
+DIAG_OFF_PEDANTIC
#include <netlink/msg.h>
-DIAG_ON(pedantic)
+DIAG_ON_PEDANTIC
#include <netlink/attr.h>
#include <linux/nl80211.h>