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 /prefs-int.h | |
| 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 'prefs-int.h')
| -rw-r--r-- | prefs-int.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/prefs-int.h b/prefs-int.h index 176d0e2b55..8e425bc85e 100644 --- a/prefs-int.h +++ b/prefs-int.h @@ -2,7 +2,7 @@ * Definitions for implementation of preference handling routines; * used by "friends" of the preferences type. * - * $Id: prefs-int.h,v 1.11 2003/12/13 17:24:47 ulfl Exp $ + * $Id: prefs-int.h,v 1.12 2004/05/09 10:03:37 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -39,9 +39,10 @@ struct pref_module { }; /* - * Module used for protocol preferences. + * Module used for protocol preferences. With MSVC and a + * libethereal.dll, we need a special declaration. */ -extern module_t *protocols_module; +ETH_VAR_IMPORT module_t *protocols_module; /* * PREF_OBSOLETE is used for preferences that a module used to support |