diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-11-04 00:45:54 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-11-04 08:46:30 +0000 |
| commit | ff9f9fc43162f3271e8335aae9b03175a0f2e7ee (patch) | |
| tree | 2a6db2a90c4a6229e1c902be890bdb52bf58f219 /tshark.c | |
| parent | 321934f2ff9665f62a8ad4b2b554b457c79fd610 (diff) | |
| download | wireshark-ff9f9fc43162f3271e8335aae9b03175a0f2e7ee.tar.gz wireshark-ff9f9fc43162f3271e8335aae9b03175a0f2e7ee.tar.bz2 wireshark-ff9f9fc43162f3271e8335aae9b03175a0f2e7ee.zip | |
Don't include "file.h" if you don't need it.
It ends up dragging in libwireshark headers, which programs not linking
with libwireshark shouldn't do. In particular, including
<epan/address.h> causes some functions that refer to libwireshark
functions to be defined if the compiler doesn't handle "static inline"
the way GCC does, and you end up requiring libwireshark even though you
shouldn't require it.
Move plurality() to wsutil/str_util.h, so that non-libwireshark code can
get it without include epan/packet.h. Fix includes as necessary.
Change-Id: Ie4819719da4c2b349f61445112aa419e99b977d3
Reviewed-on: https://code.wireshark.org/review/11545
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'tshark.c')
| -rw-r--r-- | tshark.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -86,7 +86,6 @@ #ifdef HAVE_LUA #include <epan/wslua/init_wslua.h> #endif -#include "file.h" #include "frame_tvbuff.h" #include <epan/disabled_protos.h> #include <epan/prefs.h> @@ -130,6 +129,8 @@ #include "log.h" #include <epan/funnel.h> +#include <wsutil/str_util.h> + #ifdef HAVE_PLUGINS #include <wsutil/plugins.h> #endif |