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/epan.c | |
| 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/epan.c')
| -rw-r--r-- | epan/epan.c | 8 |
1 files changed, 4 insertions, 4 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 |