diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-09-05 17:18:00 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-09-06 08:10:56 +0000 |
| commit | d0a91b27f26762e9c998cc5e6fe71767de5d32c7 (patch) | |
| tree | 9850efb16c84537dba93ee3d6ac8b186036ae00b /ui | |
| parent | 143bc04ca7c11b4f5a0feef4c01627c9aee6bcd4 (diff) | |
plugins: config.h must not be included by public headers
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 <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/cli/tap-funnel.c | 2 | ||||
| -rw-r--r-- | ui/gtk/capture_dlg.h | 1 | ||||
| -rw-r--r-- | ui/gtk/help_dlg.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/ui/cli/tap-funnel.c b/ui/cli/tap-funnel.c index 5f20d3ec1b..98446718f2 100644 --- a/ui/cli/tap-funnel.c +++ b/ui/cli/tap-funnel.c @@ -30,6 +30,8 @@ #include <epan/funnel.h> #include <stdio.h> +#include "ws_attributes.h" + void register_tap_listener_funnel(void); struct _funnel_text_window_t { diff --git a/ui/gtk/capture_dlg.h b/ui/gtk/capture_dlg.h index d6cf21b6b6..0dfeea5a93 100644 --- a/ui/gtk/capture_dlg.h +++ b/ui/gtk/capture_dlg.h @@ -32,6 +32,7 @@ */ #include "capture_opts.h" #include <gtk/gtk.h> +#include "ws_attributes.h" #define CR_MAIN_NB "compile_results_main_notebook" diff --git a/ui/gtk/help_dlg.h b/ui/gtk/help_dlg.h index 1ebd292d71..f921728250 100644 --- a/ui/gtk/help_dlg.h +++ b/ui/gtk/help_dlg.h @@ -26,6 +26,7 @@ #define __HELP_DLG_H__ #include "ui/help_url.h" +#include "ws_attributes.h" /** @file * "Help" dialog box. |