aboutsummaryrefslogtreecommitdiffstats
path: root/prefs.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2004-05-09 10:03:41 +0000
committerGuy Harris <guy@alum.mit.edu>2004-05-09 10:03:41 +0000
commit15af0f656fcd75bfcacb975476aab614e7ed8dd3 (patch)
tree96fab6287a112ff9379ebf012a7a939884b62ec1 /prefs.h
parentb964421aec471b54755db1ab9ebc768467b6fdd5 (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.h')
-rw-r--r--prefs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/prefs.h b/prefs.h
index f882b5c72b..7e788f0133 100644
--- a/prefs.h
+++ b/prefs.h
@@ -1,7 +1,7 @@
/* prefs.h
* Definitions for preference handling routines
*
- * $Id: prefs.h,v 1.60 2004/05/05 07:31:05 guy Exp $
+ * $Id: prefs.h,v 1.61 2004/05/09 10:03:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -132,7 +132,7 @@ typedef struct _e_prefs {
gboolean capture_auto_scroll;
} e_prefs;
-extern e_prefs prefs;
+ETH_VAR_IMPORT e_prefs prefs;
/*
* Routines to let modules that have preference settings register