Index: gtk/plugins_dlg.c =================================================================== --- gtk/plugins_dlg.c (revision 35158) +++ gtk/plugins_dlg.c (working copy) @@ -29,9 +29,6 @@ #include #include "epan/plugins.h" -#ifdef HAVE_LUA_5_1 -#include "epan/wslua/init_wslua.h" -#endif #include "gtk/dlg_utils.h" #include "gtk/gui_utils.h" Index: epan/wslua/init_wslua.c =================================================================== --- epan/wslua/init_wslua.c (revision 35158) +++ epan/wslua/init_wslua.c (working copy) @@ -32,9 +32,9 @@ #include #include #include +#include #include #include -#include "init_wslua.h" static lua_State* L = NULL; Index: epan/wslua/init_wslua.h =================================================================== --- epan/wslua/init_wslua.h (revision 35158) +++ epan/wslua/init_wslua.h (working copy) @@ -1,43 +0,0 @@ -/* init_wslua.h - * definitions for wslua plugins structures - * - * $Id$ - * - * Wireshark - Network traffic analyzer - * By Gerald Combs - * Copyright 1998 Gerald Combs - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef __INIT_WSLUA_H__ -#define __INIT_WSLUA_H__ - -#include -/** @defgroup wslua_group Wireshark LUA - * - */ -/** @file - * @ingroup wslua_group - */ -typedef struct _wslua_plugin { - gchar *name; /**< plugin name */ - gchar *version; /**< plugin version */ - struct _wslua_plugin *next; -} wslua_plugin; - -WS_VAR_IMPORT wslua_plugin *wslua_plugin_list; - -#endif /* __INIT_WSLUA_H__ */ Index: epan/plugins.h =================================================================== --- epan/plugins.h (revision 35158) +++ epan/plugins.h (working copy) @@ -55,6 +55,14 @@ extern void register_all_wiretap_modules(void); extern void register_all_codecs(void); +typedef struct _wslua_plugin { + gchar *name; /**< plugin name */ + gchar *version; /**< plugin version */ + struct _wslua_plugin *next; +} wslua_plugin; + +WS_VAR_IMPORT wslua_plugin *wslua_plugin_list; + #ifdef __cplusplus } #endif /* __cplusplus */