diff options
Diffstat (limited to 'plugins/megaco')
-rw-r--r-- | plugins/megaco/Makefile.nmake | 7 | ||||
-rw-r--r-- | plugins/megaco/packet-megaco.c | 12 |
2 files changed, 5 insertions, 14 deletions
diff --git a/plugins/megaco/Makefile.nmake b/plugins/megaco/Makefile.nmake index 356d4bfbd5..f2d37a4f6d 100644 --- a/plugins/megaco/Makefile.nmake +++ b/plugins/megaco/Makefile.nmake @@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) -!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL +!IFDEF ENABLE_LIBETHEREAL LINK_PLUGIN_WITH=..\..\epan\libethereal.lib CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS) -!ELSE -LINK_PLUGIN_WITH=..\plugin_api.obj -!ENDIF OBJECTS=packet-megaco.obj @@ -24,6 +21,8 @@ megaco.dll megaco.exp megaco.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) link -dll /out:megaco.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) +!ENDIF + clean: rm -f $(OBJECTS) megaco.dll megaco.exp megaco.lib *.pdb diff --git a/plugins/megaco/packet-megaco.c b/plugins/megaco/packet-megaco.c index 893f8dc77a..794fcc9be6 100644 --- a/plugins/megaco/packet-megaco.c +++ b/plugins/megaco/packet-megaco.c @@ -39,7 +39,6 @@ #include "config.h" #endif -#include "plugins/plugin_api.h" #include "moduleinfo.h" #include <stdio.h> @@ -55,8 +54,6 @@ #include "sctpppids.h" #include <epan/dissectors/packet-tpkt.h> -#include "plugins/plugin_api_defs.h" - #ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = VERSION; #endif @@ -2743,13 +2740,8 @@ plugin_reg_handoff(void){ } G_MODULE_EXPORT void -plugin_init(plugin_address_table_t *pat -#ifndef PLUGINS_NEED_ADDRESS_TABLE - _U_ -#endif - ){ - /* initialise the table of pointers needed in Win32 DLLs */ - plugin_address_table_init(pat); +new_plugin_init(void) +{ /* register the new protocol, protocol fields, and subtrees */ if (proto_megaco == -1) { /* execute protocol initialization only once */ proto_register_megaco(); |