diff options
author | Guy Harris <guy@alum.mit.edu> | 2013-07-14 10:30:49 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2013-07-14 10:30:49 +0000 |
commit | 1f32615d993a6263461e9c288af0de2de3986a03 (patch) | |
tree | 8767325051f3d94e49727807f834cde200f92eaa /epan | |
parent | f99694bb11d8dbdeb45aa5b93059c633078ae60a (diff) |
Export tvb_free_chain() so that tvbtest can use it.
As on Windows with MSVC, and as with reassemble_test, link tvbtest with
libwireshark and the libraries it requires.
svn path=/trunk/; revision=50575
Diffstat (limited to 'epan')
-rw-r--r-- | epan/Makefile.am | 8 | ||||
-rw-r--r-- | epan/tvbuff.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am index 834ad9d7e1..55bb3c78a2 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -155,14 +155,16 @@ libwireshark_la_DEPENDENCIES = \ ${top_builddir}/wsutil/libwsutil.la \ ${top_builddir}/wiretap/libwiretap.la -EXTRA_PROGRAMS = reassemble_test +EXTRA_PROGRAMS = reassemble_test tvbtest reassemble_test_LDADD = \ libwireshark.la \ $(GLIB_LIBS) \ -lz -tvbtest: tvbtest.o tvbuff.o tvbuff_real.o tvbuff_subset.o except.o to_str.o strutil.o emem.o charsets.o - $(LINK) $^ $(GLIB_LIBS) -lz +tvbtest_LDADD = \ + libwireshark.la \ + $(GLIB_LIBS) \ + -lz exntest: exntest.o except.o $(LINK) $^ $(GLIB_LIBS) diff --git a/epan/tvbuff.h b/epan/tvbuff.h index 144e8c9b1a..c747de846b 100644 --- a/epan/tvbuff.h +++ b/epan/tvbuff.h @@ -135,7 +135,7 @@ WS_DLL_PUBLIC void tvb_free(tvbuff_t*); * must not be in a chain. * If specified, a callback to free the tvbuff data will be invoked * for each tvbuff free'd */ -void tvb_free_chain(tvbuff_t*); +WS_DLL_PUBLIC void tvb_free_chain(tvbuff_t*); /** Set a callback function to call when a tvbuff is actually freed * One argument is passed to that callback --- a void* that points |