diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-06-25 20:42:07 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-06-25 20:42:07 +0000 |
| commit | e6e6d6217ba78d0936898815b87a514acca2e449 (patch) | |
| tree | c5fb9e41f81d4e9501978141712babc952e62083 /epan | |
| parent | 8eeebf73e0743192e9c395ea240f41dd08ab0670 (diff) | |
From Tony Trinh:
Update Lua from 5.1 to 5.2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400
svn path=/trunk/; revision=43482
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/epan.c | 8 | ||||
| -rw-r--r-- | epan/filesystem.c | 6 | ||||
| -rw-r--r-- | epan/plugins.c | 4 | ||||
| -rw-r--r-- | epan/wslua/wslua.h | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/epan/epan.c b/epan/epan.c index 538026007f..f28cb6124d 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -54,7 +54,7 @@ #include "emem.h" #include "expert.h" -#ifdef HAVE_LUA_5_1 +#ifdef HAVE_LUA #include <lua.h> #include <wslua/wslua.h> #endif @@ -117,7 +117,7 @@ epan_init(void (*register_all_protocols_func)(register_cb cb, gpointer client_da final_registration_all_protocols(); host_name_lookup_init(); expert_init(); -#ifdef HAVE_LUA_5_1 +#ifdef HAVE_LUA wslua_init(cb, client_data); #endif #ifdef HAVE_GEOIP @@ -295,12 +295,12 @@ epan_get_compiled_version_info(GString *str) /* LUA */ g_string_append(str, ", "); -#ifdef HAVE_LUA_5_1 +#ifdef HAVE_LUA g_string_append(str, "with "); g_string_append(str, LUA_VERSION); #else g_string_append(str, "without Lua"); -#endif /* HAVE_LUA_5_1 */ +#endif /* HAVE_LUA */ g_string_append(str, ", "); #ifdef HAVE_PYTHON diff --git a/epan/filesystem.c b/epan/filesystem.c index ea41a10eda..761d17013a 100644 --- a/epan/filesystem.c +++ b/epan/filesystem.c @@ -771,7 +771,7 @@ get_wspython_dir(void) } -#if defined(HAVE_PLUGINS) || defined(HAVE_LUA_5_1) +#if defined(HAVE_PLUGINS) || defined(HAVE_LUA) /* * Find the directory where the plugins are stored. * @@ -850,7 +850,7 @@ init_plugin_dir(void) } #endif } -#endif /* HAVE_PLUGINS || HAVE_LUA_5_1 */ +#endif /* HAVE_PLUGINS || HAVE_LUA */ /* * Get the directory in which the plugins are stored. @@ -858,7 +858,7 @@ init_plugin_dir(void) const char * get_plugin_dir(void) { -#if defined(HAVE_PLUGINS) || defined(HAVE_LUA_5_1) +#if defined(HAVE_PLUGINS) || defined(HAVE_LUA) if (!plugin_dir) init_plugin_dir(); return plugin_dir; #else diff --git a/epan/plugins.c b/epan/plugins.c index 2e8e863fa2..3af1d80907 100644 --- a/epan/plugins.c +++ b/epan/plugins.c @@ -519,7 +519,7 @@ plugins_dump_all(void) plugin *pt_plug; const char *sep; #endif -#ifdef HAVE_LUA_5_1 +#ifdef HAVE_LUA wslua_plugin *lua_plug; #endif @@ -552,7 +552,7 @@ plugins_dump_all(void) } #endif -#ifdef HAVE_LUA_5_1 +#ifdef HAVE_LUA for (lua_plug = wslua_plugin_list; lua_plug != NULL; lua_plug = lua_plug->next) { printf("%s\t%s\tlua script\t%s\n", lua_plug->name, lua_plug->version, lua_plug->filename); diff --git a/epan/wslua/wslua.h b/epan/wslua/wslua.h index 8a70d20b44..da6ecbb11d 100644 --- a/epan/wslua/wslua.h +++ b/epan/wslua/wslua.h @@ -297,7 +297,7 @@ C shift##C(lua_State* L,int i) { \ } \ typedef int dummy##C -#ifdef HAVE_LUA_5_1 +#ifdef HAVE_LUA #if LUA_VERSION_NUM >= 502 #define WSLUA_REGISTER_CLASS(C) { \ |