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 /alert_box.c | |
parent | b964421aec471b54755db1ab9ebc768467b6fdd5 (diff) | |
download | wireshark-15af0f656fcd75bfcacb975476aab614e7ed8dd3.tar.gz wireshark-15af0f656fcd75bfcacb975476aab614e7ed8dd3.tar.bz2 wireshark-15af0f656fcd75bfcacb975476aab614e7ed8dd3.zip |
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 'alert_box.c')
-rw-r--r-- | alert_box.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/alert_box.c b/alert_box.c index 3dca87a893..03cc03f555 100644 --- a/alert_box.c +++ b/alert_box.c @@ -2,7 +2,7 @@ * Routines to put up various "standard" alert boxes used in multiple * places * - * $Id: alert_box.c,v 1.6 2004/04/16 23:16:28 guy Exp $ + * $Id: alert_box.c,v 1.7 2004/05/09 10:03:36 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -23,6 +23,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* With MSVC and a libethereal.dll this file needs to import some variables + in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */ +#define _NEED_VAR_IMPORT_ + #ifdef HAVE_CONFIG_H # include "config.h" #endif |