Wireshark-commits: [Wireshark-commits] master 58431e2: Don't include libwireshark headers from libw
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=58431e2f6a939022261e1f54a9bf3e4fa39958ca
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
58431e2 by Guy Harris (guy@xxxxxxxxxxxx):
Don't include libwireshark headers from libwiretap.
Move the definitions of hashipv4_t and hashipv6_t to wiretap/wtap.h, as
that's the main place they're used. Change them a bit not to depend on
other stuff from libwireshark, and change the code as required by those
changes.
This should fix the Solaris build; apparently, the Sun^WOracle compiler
is generating code for static inline functions even if they're never
called, so that libwiretap ends up including code that calls tvbuff and
wmem functions.
There's probably further cleanup that could be done here, but this
should at least fix the build, as well as getting rid of a dependency
between two libraries that are at least somewhat independent (libwiretap
should *not* depend on libwireshark, as some programs use libwiretap but
not libwireshark, and, ultimately, we probably want it to be possible to
use libwireshark without libwiretap but that'd be more work).
Change-Id: I91c745282f17d7c8bff7809aa277eab2b3cf47c1
Reviewed-on: https://code.wireshark.org/review/11537
Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from 40b45df packetbb; display Addressblock Tail as Tail
adds 58431e2 Don't include libwireshark headers from libwiretap.
Summary of changes:
epan/addr_resolv.c | 2 +-
epan/addr_resolv.h | 15 +--------------
epan/wslua/wslua_capture_info.c | 2 +-
wiretap/pcapng.c | 1 -
wiretap/wtap.h | 17 +++++++++++++++++
5 files changed, 20 insertions(+), 17 deletions(-)
