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 /packet-rpc.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 'packet-rpc.h')
-rw-r--r-- | packet-rpc.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/packet-rpc.h b/packet-rpc.h index 2a26246db7..706810d967 100644 --- a/packet-rpc.h +++ b/packet-rpc.h @@ -1,6 +1,6 @@ /* packet-rpc.h * - * $Id: packet-rpc.h,v 1.44 2003/11/16 23:17:21 guy Exp $ + * $Id: packet-rpc.h,v 1.45 2004/05/09 10:03:37 guy Exp $ * * (c) 1999 Uwe Girlich * @@ -170,7 +170,10 @@ typedef struct _rpc_prog_info_value { GArray *procedure_hfs; } rpc_prog_info_value; -extern GHashTable *rpc_progs; +/* rpc_progs is also used in tap. With MSVC and a + * libethereal.dll, we need a special declaration. + */ +ETH_VAR_IMPORT GHashTable *rpc_progs; typedef struct _rpc_proc_info_key { guint32 prog; @@ -184,7 +187,10 @@ typedef struct _rpc_proc_info_value { dissect_function_t *dissect_reply; } rpc_proc_info_value; -extern GHashTable *rpc_procs; +/* rpc_procs is also used in tap. With MSVC and a + * libethereal.dll, we need a special declaration. + */ +ETH_VAR_IMPORT GHashTable *rpc_procs; #endif /* packet-rpc.h */ |