Use GLib's G_MODULE_EXPORT when defining constants and functions

exported by a plugin, rather than defining our own DLLEXPORT.

svn path=/trunk/; revision=2713

3 files changed, 11 insertions, 20 deletions

diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c
index 994bd1314a..eebcc2212e 100644
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/gryphon/packet-gryphon.c
@@ -1,7 +1,7 @@
 /* packet-gryphon.c
  * Routines for Gryphon protocol packet disassembly
  *
- * $Id: packet-gryphon.c,v 1.15 2000/11/06 08:44:05 guy Exp $
+ * $Id: packet-gryphon.c,v 1.16 2000/11/29 09:49:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Steve Limkemann <stevelim@dgtech.com>
@@ -41,7 +41,7 @@
 #include <ctype.h>
 #include <time.h>
 
-#include <glib.h>
+#include <gmodule.h>
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif
@@ -49,7 +49,7 @@
 #include "dfilter.h"
 #include "packet-gryphon.h"
 
-DLLEXPORT const gchar version[] = VERSION;
+G_MODULE_EXPORT const gchar version[] = VERSION;
 
 #ifndef G_HAVE_GINT64
 #error "Sorry, this won't compile without 64-bit integer support"
@@ -1657,7 +1657,7 @@ blm_mode (int src, const u_char **data, const u_char *dataend, int *offset, int
     BUMP (*offset, *data, 4);
 }
 
-DLLEXPORT void
+G_MODULE_EXPORT void
 plugin_init(plugin_address_table_t *pat)
 {
     static hf_register_info hf[] = {
@@ -1713,7 +1713,7 @@ plugin_init(plugin_address_table_t *pat)
     }
 }
 
-DLLEXPORT void
+G_MODULE_EXPORT void
 plugin_reg_handoff(void)
 {
     old_dissector_add("tcp.port", 7000, &dissect_gryphon);
diff --git a/plugins/mgcp/packet-mgcp.c b/plugins/mgcp/packet-mgcp.c
index 10fa792019..38c8912f28 100644
--- a/plugins/mgcp/packet-mgcp.c
+++ b/plugins/mgcp/packet-mgcp.c
@@ -2,7 +2,7 @@
  * Routines for mgcp packet disassembly
  * RFC 2705
  *
- * $Id: packet-mgcp.c,v 1.7 2000/11/22 06:22:35 gram Exp $
+ * $Id: packet-mgcp.c,v 1.8 2000/11/29 09:49:30 guy Exp $
  * 
  * Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
  *
@@ -42,7 +42,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <glib.h>
+#include <gmodule.h>
 #include <ctype.h>
 #include <time.h>
 #include <string.h>
@@ -51,7 +51,7 @@
 #include "prefs.h"
 #include "strutil.h"
 
-DLLEXPORT const gchar version[] = VERSION;
+G_MODULE_EXPORT const gchar version[] = VERSION;
 
 #define TCP_PORT_MGCP_GATEWAY 2427
 #define UDP_PORT_MGCP_GATEWAY 2427
@@ -1041,7 +1041,7 @@ static gint tvb_section_length(tvbuff_t* tvb, gint tvb_sectionbegin,
 
 
 /* Start the functions we need for the plugin stuff */
-DLLEXPORT void
+G_MODULE_EXPORT void
 plugin_reg_handoff(void){
   proto_reg_handoff_mgcp();
 
@@ -1051,7 +1051,7 @@ plugin_reg_handoff(void){
   sdp_handle = find_dissector("sdp");
 }
 
-DLLEXPORT void
+G_MODULE_EXPORT void
 plugin_init(plugin_address_table_t *pat){
   /* initialise the table of pointers needed in Win32 DLLs */
   plugin_address_table_init(pat);
diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h
index d2125a66de..6b6e24cbff 100644
--- a/plugins/plugin_api.h
+++ b/plugins/plugin_api.h
@@ -1,7 +1,7 @@
 /* plugin_api.h
  * Routines for Ethereal plugins.
  *
- * $Id: plugin_api.h,v 1.12 2000/11/15 07:07:50 guy Exp $
+ * $Id: plugin_api.h,v 1.13 2000/11/29 09:49:27 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * Copyright 2000 by Gilbert Ramirez <gram@xiexie.org>
@@ -25,10 +25,6 @@
 
 #ifdef PLUGINS_NEED_ADDRESS_TABLE
 
-#ifdef _WIN32
-#define DLLEXPORT    __declspec(dllexport)
-#endif
-
 /* Some OSes (Win32) have DLLs that cannot reference symbols in the parent
    executable, so the executable needs to provide a collection of pointers
    to those functions for the DLL plugin to use. */
@@ -164,11 +160,6 @@
 
 #define pi	(*p_pi)
 
-#else
-
-/* ! PLUGINS_NEED_ADDRESS_TABLE */
-#define DLLEXPORT 
-
 #endif
 
 #include "packet.h"