From d0a91b27f26762e9c998cc5e6fe71767de5d32c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Tue, 5 Sep 2017 17:18:00 +0100 Subject: plugins: config.h must not be included by public headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For a sane plugin build environment. Include config.h as the first header in the .c file instead. Fix by moving required compiler attribute macros to a new "ws_attributes.h" API header. Change-Id: I34f58a927f68c1a0e59686c14d214825149749e1 Reviewed-on: https://code.wireshark.org/review/23400 Petri-Dish: João Valverde Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde --- caputils/capture-pcap-util.c | 2 ++ caputils/iface_monitor.c | 1 + caputils/ws80211_utils.h | 2 ++ 3 files changed, 5 insertions(+) (limited to 'caputils') diff --git a/caputils/capture-pcap-util.c b/caputils/capture-pcap-util.c index 910918c28d..87e0516692 100644 --- a/caputils/capture-pcap-util.c +++ b/caputils/capture-pcap-util.c @@ -39,6 +39,8 @@ #include #endif +#include "ws_attributes.h" + /* * Linux bonding devices mishandle unknown ioctls; they fail * with ENODEV rather than ENOTSUP, EOPNOTSUPP, or ENOTTY, diff --git a/caputils/iface_monitor.c b/caputils/iface_monitor.c index 6ff5b54c54..f9bf13ebb7 100644 --- a/caputils/iface_monitor.c +++ b/caputils/iface_monitor.c @@ -25,6 +25,7 @@ #ifdef HAVE_LIBPCAP #include +#include "ws_attributes.h" #if defined(HAVE_LIBNL) diff --git a/caputils/ws80211_utils.h b/caputils/ws80211_utils.h index 247dfe2050..3e29acd6a0 100644 --- a/caputils/ws80211_utils.h +++ b/caputils/ws80211_utils.h @@ -27,6 +27,8 @@ extern "C" { #endif /* __cplusplus */ +#include "ws_attributes.h" + enum ws80211_channel_type { WS80211_CHAN_NO_HT, WS80211_CHAN_HT20, -- cgit v1.2.3