diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-05-09 10:03:41 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-05-09 10:03:41 +0000 |
| commit | 15af0f656fcd75bfcacb975476aab614e7ed8dd3 (patch) | |
| tree | 96fab6287a112ff9379ebf012a7a939884b62ec1 /epan/ftypes | |
| parent | b964421aec471b54755db1ab9ebc768467b6fdd5 (diff) | |
From Lars Roland: add support for building a libethereal.dll with MSVC:
add a config.nmake option to control whether to build
libethereal.dll or not;
remove "./wiretap" from PATH to prevent problems due to
wrongly-loaded files;
build dissector.lib with MSVC;
move "print.c" and "ps.c" to the dissector helpers, as "print.c"
imports variables from packet-frame.c and packet-data.c, which
are in libethereal;
move "g711.c" out of the dissector helpers, as they're used only
by Ethereal in a tap, not in Tethereal or in any dissector;
add a .def file for libethereal;
arrange to declare global variables exported from libethereal
with "__declspec(dllimport)" when building programs that import
those variables;
update the NSIS installer.
Make the "configure" script define ETH_VAR_IMPORT as "extern".
svn path=/trunk/; revision=10834
Diffstat (limited to 'epan/ftypes')
| -rw-r--r-- | epan/ftypes/ftypes.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h index be23651f9f..01ba4e20f2 100644 --- a/epan/ftypes/ftypes.h +++ b/epan/ftypes/ftypes.h @@ -1,7 +1,7 @@ /* ftypes.h * Definitions for field types * - * $Id: ftypes.h,v 1.31 2004/02/27 12:00:32 obiot Exp $ + * $Id: ftypes.h,v 1.32 2004/05/09 10:03:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -226,8 +226,12 @@ void fvalue_init(fvalue_t *fv, ftenum_t ftype); -/* Free all memory used by an fvalue_t */ -extern fvalue_t *fvalue_free_list; +/* Free all memory used by an fvalue_t. With MSVC and a + * libethereal.dll, we need a special declaration. + */ +ETH_VAR_IMPORT fvalue_t *fvalue_free_list; + + #define FVALUE_CLEANUP(fv) \ { \ register FvalueFreeFunc free_value; \ |