diff options
-rw-r--r-- | AUTHORS | 1 | ||||
-rw-r--r-- | doc/ethereal.pod | 1 | ||||
-rw-r--r-- | plugins/asn1/packet-asn1.c | 4 | ||||
-rw-r--r-- | plugins/gryphon/packet-gryphon.c | 8 |
4 files changed, 11 insertions, 3 deletions
@@ -1931,6 +1931,7 @@ And assorted fixes and enhancements by the people listed above and by: Ian Schorr <ischorr [AT] comcast.net> David E. Weekly <david [AT] weekly.org> Steve Ford <sford [AT] geeky-boy.com> + Masaki Chikama <masaki-c [AT] is.aist-nara.ac.jp> Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/doc/ethereal.pod b/doc/ethereal.pod index 905bed4b15..0ccfc9c6b2 100644 --- a/doc/ethereal.pod +++ b/doc/ethereal.pod @@ -2002,6 +2002,7 @@ B<http://www.ethereal.com>. Ian Schorr <ischorr [AT] comcast.net> David E. Weekly <david [AT] weekly.org> Steve Ford <sford [AT] geeky-boy.com> + Masaki Chikama <masaki-c [AT] is.aist-nara.ac.jp> Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c index e517fdebd6..c1085cc9c2 100644 --- a/plugins/asn1/packet-asn1.c +++ b/plugins/asn1/packet-asn1.c @@ -3,7 +3,7 @@ * * Copyright (c) 2003 by Matthijs Melchior <matthijs.melchior@xs4all.nl> * - * $Id: packet-asn1.c,v 1.8 2003/11/04 16:44:25 gerald Exp $ + * $Id: packet-asn1.c,v 1.9 2003/11/04 18:37:30 guy Exp $ * * A plugin for: * @@ -4771,7 +4771,7 @@ proto_reg_handoff_asn1(void) { /* Start the functions we need for the plugin stuff */ -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT void plugin_reg_handoff(void){ diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c index b7844c0635..785079d696 100644 --- a/plugins/gryphon/packet-gryphon.c +++ b/plugins/gryphon/packet-gryphon.c @@ -3,7 +3,7 @@ * By Steve Limkemann <stevelim@dgtech.com> * Copyright 1998 Steve Limkemann * - * $Id: packet-gryphon.c,v 1.42 2003/10/06 15:41:53 jmayer Exp $ + * $Id: packet-gryphon.c,v 1.43 2003/11/04 18:37:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -2290,6 +2290,9 @@ proto_reg_handoff_gryphon(void) } /* Start the functions we need for the plugin stuff */ + +#ifndef ENABLE_STATIC + G_MODULE_EXPORT void plugin_reg_handoff(void){ proto_reg_handoff_gryphon(); @@ -2308,4 +2311,7 @@ _U_ proto_register_gryphon(); } } + +#endif + /* End the functions we need for plugin stuff */ |