diff options
| author | João Valverde <j@v6e.pt> | 2021-10-16 10:33:34 +0100 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-10-22 06:41:44 +0000 |
| commit | 59c082c046c5039d745901b1cf5ac51e50a26a71 (patch) | |
| tree | d01ee2414ccdab9737ac1064dc78ee9382bbd91e /wiretap | |
| parent | 79b0e4999aa051f3dce4aa025dd519e9cef31d26 (diff) | |
Add new global header wireshark.h with guideline
Remove ws_diag_control.h from config.h because that was a workaround
for the lack of a public global header. Fix the resultant build errors.
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/busmaster_parser.lemon | 1 | ||||
| -rw-r--r-- | wiretap/file_wrappers.c | 6 | ||||
| -rw-r--r-- | wiretap/file_wrappers.h | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/wiretap/busmaster_parser.lemon b/wiretap/busmaster_parser.lemon index 436794790a..59b79cd4d4 100644 --- a/wiretap/busmaster_parser.lemon +++ b/wiretap/busmaster_parser.lemon @@ -14,6 +14,7 @@ #include "config.h" #include <assert.h> #include <string.h> +#include <wireshark.h> #include <wiretap/file_wrappers.h> #include "busmaster_priv.h" diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c index 1bd219408a..337010d625 100644 --- a/wiretap/file_wrappers.c +++ b/wiretap/file_wrappers.c @@ -14,15 +14,15 @@ * */ -#include <config.h> +#include "config.h" +#include "file_wrappers.h" #include <assert.h> #include <errno.h> #include <string.h> #include "wtap-int.h" -#include "file_wrappers.h" + #include <wsutil/file_util.h> -#include <wsutil/ws_assert.h> #ifdef HAVE_ZLIB #define ZLIB_CONST diff --git a/wiretap/file_wrappers.h b/wiretap/file_wrappers.h index 40fe9c9788..14dfa94eef 100644 --- a/wiretap/file_wrappers.h +++ b/wiretap/file_wrappers.h @@ -9,10 +9,9 @@ #ifndef __WTAP_FILE_WRAPPERS_H__ #define __WTAP_FILE_WRAPPERS_H__ -#include <glib.h> +#include <wireshark.h> #include "wtap.h" #include <wsutil/file_util.h> -#include "ws_symbol_export.h" extern FILE_T file_open(const char *path); extern FILE_T file_fdopen(int fildes); |