aboutsummaryrefslogtreecommitdiffstats
path: root/caputils/ws80211_utils.c
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2015-02-17 21:30:59 +0100
committerMichael Mann <mmann78@netscape.net>2015-02-18 12:04:33 +0000
commit4342333344690341ad7d589f888dd53248b0d397 (patch)
tree701a92a89714729bdff56d52cb31b89bf16e401d /caputils/ws80211_utils.c
parent7263af87c6b0019c1bfda0f66fdc991330941892 (diff)
libnl: disable pedantic warning of libnl lib
/usr/include/libnl3/netlink/types.h:25:15: warning: comma at end of enumerator list [-Wpedantic] /usr/include/libnl3/netlink/handlers.h:65:9: warning: comma at end of enumerator list [-Wpedantic] /usr/include/libnl3/netlink/handlers.h:81:18: warning: comma at end of enumerator list [-Wpedantic] /usr/include/libnl3/netlink/handlers.h:113:18: warning: comma at end of enumerator list [-Wpedantic] /usr/include/libnl3/netlink/utils.h:43:13: warning: comma at end of enumerator list [-Wpedantic] /usr/include/libnl3/netlink/attr.h:47:16: warning: comma at end of enumerator list [-Wpedantic] /usr/include/libnl3/netlink/route/link.h:95:23: warning: comma at end of enumerator list [-Wpedantic] ... Change-Id: I3f14e9d4887569e5d7befe1adb77561c8793437e Reviewed-on: https://code.wireshark.org/review/7201 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'caputils/ws80211_utils.c')
-rw-r--r--caputils/ws80211_utils.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/caputils/ws80211_utils.c b/caputils/ws80211_utils.c
index 7fbcd7a8f2..c53dcf6d39 100644
--- a/caputils/ws80211_utils.c
+++ b/caputils/ws80211_utils.c
@@ -30,6 +30,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <glib/gstdio.h>
#include "ws80211_utils.h"
+#include "wsutil/ws_diag_control.h"
#if defined(HAVE_LIBNL) && defined(HAVE_NL80211)
#include <string.h>
@@ -42,7 +43,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <netlink/genl/genl.h>
#include <netlink/genl/family.h>
#include <netlink/genl/ctrl.h>
+DIAG_OFF(pedantic)
#include <netlink/msg.h>
+DIAG_ON(pedantic)
#include <netlink/attr.h>
#include <linux/nl80211.h>