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
This commit is contained in:
parent
f99694bb11
commit
1f32615d99
|
@ -155,14 +155,16 @@ libwireshark_la_DEPENDENCIES = \
|
||||||
${top_builddir}/wsutil/libwsutil.la \
|
${top_builddir}/wsutil/libwsutil.la \
|
||||||
${top_builddir}/wiretap/libwiretap.la
|
${top_builddir}/wiretap/libwiretap.la
|
||||||
|
|
||||||
EXTRA_PROGRAMS = reassemble_test
|
EXTRA_PROGRAMS = reassemble_test tvbtest
|
||||||
reassemble_test_LDADD = \
|
reassemble_test_LDADD = \
|
||||||
libwireshark.la \
|
libwireshark.la \
|
||||||
$(GLIB_LIBS) \
|
$(GLIB_LIBS) \
|
||||||
-lz
|
-lz
|
||||||
|
|
||||||
tvbtest: tvbtest.o tvbuff.o tvbuff_real.o tvbuff_subset.o except.o to_str.o strutil.o emem.o charsets.o
|
tvbtest_LDADD = \
|
||||||
$(LINK) $^ $(GLIB_LIBS) -lz
|
libwireshark.la \
|
||||||
|
$(GLIB_LIBS) \
|
||||||
|
-lz
|
||||||
|
|
||||||
exntest: exntest.o except.o
|
exntest: exntest.o except.o
|
||||||
$(LINK) $^ $(GLIB_LIBS)
|
$(LINK) $^ $(GLIB_LIBS)
|
||||||
|
|
|
@ -135,7 +135,7 @@ WS_DLL_PUBLIC void tvb_free(tvbuff_t*);
|
||||||
* must not be in a chain.
|
* must not be in a chain.
|
||||||
* If specified, a callback to free the tvbuff data will be invoked
|
* If specified, a callback to free the tvbuff data will be invoked
|
||||||
* for each tvbuff free'd */
|
* 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
|
/** Set a callback function to call when a tvbuff is actually freed
|
||||||
* One argument is passed to that callback --- a void* that points
|
* One argument is passed to that callback --- a void* that points
|
||||||
|
|
Loading…
Reference in New Issue