"plugin_api.c" needs to include <glib.h>, to define G_HAVE_GINT64 on

platforms that have "gint64".

Fix plugin-table lines for "dissector_delete()", "dissect_data()",
"prefs_register_module()", and "prefs_register_uint_preference()".

The MGCP dissector uses routines from GLib, so when building it as a DLL
for Windows, it has to be linked with "glib-XXX.lib".

svn path=/trunk/; revision=2643

4 files changed, 12 insertions, 9 deletions

diff --git a/plugins/mgcp/Makefile.nmake b/plugins/mgcp/Makefile.nmake
index 20a0f0de4b..6803a9cbfb 100644
--- a/plugins/mgcp/Makefile.nmake
+++ b/plugins/mgcp/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.1 2000/11/12 11:08:46 guy Exp $
+# $Id: Makefile.nmake,v 1.2 2000/11/14 10:38:15 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -14,7 +14,8 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../epan /I../../wiretap \
 OBJECTS=packet-mgcp.obj 
 
 mgcp.dll mgcp.exp mgcp.lib : packet-mgcp.obj ..\plugin_api.obj
-	link -dll /out:mgcp.dll packet-mgcp.obj ..\plugin_api.obj
+	link -dll /out:mgcp.dll packet-mgcp.obj ..\plugin_api.obj \
+	$(GLIB_DIR)\glib-$(GLIB_VERSION).lib
 
 clean:
 	rm -f $(OBJECTS) mgcp.dll mgcp.exp mgcp.lib
diff --git a/plugins/plugin_api.c b/plugins/plugin_api.c
index 71f5216dab..ffe773aa10 100644
--- a/plugins/plugin_api.c
+++ b/plugins/plugin_api.c
@@ -1,7 +1,7 @@
 /* plugin_api.c
  * Routines for Ethereal plugins.
  *
- * $Id: plugin_api.c,v 1.11 2000/11/13 10:13:21 guy Exp $
+ * $Id: plugin_api.c,v 1.12 2000/11/14 10:38:13 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * Copyright 2000 by Gilbert Ramirez <gram@xiexie.org>
@@ -29,6 +29,8 @@
 
 #include <stdarg.h>
 
+#include <glib.h>
+
 #include "plugin_api.h"
 
 packet_info			*p_pi = NULL;
@@ -49,7 +51,7 @@ plugin_address_table_init(plugin_address_table_t *pat)
 	p_proto_register_subtree_array		= pat->p_proto_register_subtree_array;
 	p_dissector_add				= pat->p_dissector_add;
 	p_old_dissector_add			= pat->p_old_dissector_add;
-	p_dissector_delete			= pat->p_old_dissector_delete;
+	p_dissector_delete			= pat->p_dissector_delete;
 	p_heur_dissector_add			= pat->p_heur_dissector_add;
 	p_dissect_data				= pat->p_dissect_data;
 	p_old_dissect_data			= pat->p_old_dissect_data;
diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h
index bcbb475826..c93d4606ef 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.10 2000/11/13 10:13:24 guy Exp $
+ * $Id: plugin_api.h,v 1.11 2000/11/14 10:38:13 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * Copyright 2000 by Gilbert Ramirez <gram@xiexie.org>
@@ -57,7 +57,7 @@
 
 #define	heur_dissector_add		(*p_heur_dissector_add)
 
-#define dissect_data			(*p_old_dissect_data)
+#define dissect_data			(*p_dissect_data)
 #define old_dissect_data		(*p_old_dissect_data)
 
 #define proto_is_protocol_enabled	(*p_proto_is_protocol_enabled)
diff --git a/plugins/plugin_table.h b/plugins/plugin_table.h
index 687fdf80a3..3073fa825c 100644
--- a/plugins/plugin_table.h
+++ b/plugins/plugin_table.h
@@ -1,7 +1,7 @@
 /* plugin_table.h
  * Table of exported addresses for Ethereal plugins.
  *
- * $Id: plugin_table.h,v 1.7 2000/11/13 10:13:26 guy Exp $
+ * $Id: plugin_table.h,v 1.8 2000/11/14 10:38:13 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * Copyright 2000 by Gilbert Ramirez <gram@xiexie.org>
@@ -156,9 +156,9 @@ typedef gint (*addr_tvb_strncaseeql)(tvbuff_t*, gint, const guint8 *, gint);
 
 typedef gchar *(*addr_tvb_bytes_to_str)(tvbuff_t*, gint, gint len);
 
-typedef module_t *(*addr_prefs_register_module(const char *, const char *,
+typedef module_t *(*addr_prefs_register_module)(const char *, const char *,
     void (*)(void));
-typedef void (*addr_prefs_register_uint_preference(module_t *, const char *,
+typedef void (*addr_prefs_register_uint_preference)(module_t *, const char *,
     const char *, const char *, guint, guint *);
 typedef void (*addr_prefs_register_bool_preference)(module_t *, const char *,
     const char *, const char *, gboolean *);