osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix build with recent lua changes. 

Use FT_NONE instead of 0 to initialize an enum.
Drop use of lround/llround since they are not available on Windows.

Change-Id: I3961c1921304bafc090c763f0d6de8532f0b3510
Reviewed-on: https://code.wireshark.org/review/425
Reviewed-by: Evan Huus <eapache@gmail.com>
This commit is contained in:
Evan Huus 2014-02-27 16:59:08 -05:00
parent 655f2e4dd4
commit 54cccefef6
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
epan/wslua/wslua.h
View File

@ -73,25 +73,25 @@
using Lua's already-available lua_tointeger() and luaL_checkint() might be different
on different machines; so use these instead please! */
#define wslua_togint(L,i) (gint) ( lua_tointeger(L,i) )
#define wslua_togint32(L,i) (gint32) lround ( lua_tonumber(L,i) )
#define wslua_togint64(L,i) (gint64) llround ( lua_tonumber(L,i) )
#define wslua_togint32(L,i) (gint32) ( lua_tonumber(L,i) )
#define wslua_togint64(L,i) (gint64) ( lua_tonumber(L,i) )
#define wslua_toguint(L,i) (guint) ( lua_tointeger(L,i) )
#define wslua_toguint32(L,i) (guint32) lround ( lua_tonumber(L,i) )
#define wslua_toguint64(L,i) (guint64) llround ( lua_tonumber(L,i) )
#define wslua_toguint32(L,i) (guint32) ( lua_tonumber(L,i) )
#define wslua_toguint64(L,i) (guint64) ( lua_tonumber(L,i) )
#define wslua_checkgint(L,i) (gint) ( luaL_checkint(L,i) )
#define wslua_checkgint32(L,i) (gint32) lround ( luaL_checknumber(L,i) )
#define wslua_checkgint64(L,i) (gint64) llround ( luaL_checknumber(L,i) )
#define wslua_checkgint32(L,i) (gint32) ( luaL_checknumber(L,i) )
#define wslua_checkgint64(L,i) (gint64) ( luaL_checknumber(L,i) )
#define wslua_checkguint(L,i) (guint) ( luaL_checkint(L,i) )
#define wslua_checkguint32(L,i) (guint32) lround ( luaL_checknumber(L,i) )
#define wslua_checkguint64(L,i) (guint64) llround ( luaL_checknumber(L,i) )
#define wslua_checkguint32(L,i) (guint32) ( luaL_checknumber(L,i) )
#define wslua_checkguint64(L,i) (guint64) ( luaL_checknumber(L,i) )
#define wslua_optgint(L,i,d) (gint) ( luaL_optint(L,i,d) )
#define wslua_optgint32(L,i,d) (gint32) lround ( luaL_optnumber(L,i,d) )
#define wslua_optgint64(L,i,d) (gint64) llround ( luaL_optnumber(L,i,d) )
#define wslua_optgint32(L,i,d) (gint32) ( luaL_optnumber(L,i,d) )
#define wslua_optgint64(L,i,d) (gint64) ( luaL_optnumber(L,i,d) )
#define wslua_optguint(L,i,d) (guint) ( luaL_optint(L,i,d) )
#define wslua_optguint32(L,i,d) (guint32) lround ( luaL_optnumber(L,i,d) )
#define wslua_optguint64(L,i,d) (guint64) llround ( luaL_optnumber(L,i,d) )
#define wslua_optguint32(L,i,d) (guint32) ( luaL_optnumber(L,i,d) )
#define wslua_optguint64(L,i,d) (guint64) ( luaL_optnumber(L,i,d) )
struct _wslua_tvb {

2
epan/wslua/wslua_proto.c
View File

@ -1663,7 +1663,7 @@ int Proto_commit(lua_State* L) {
for (lua_pushnil(L); lua_next(L, 4); lua_pop(L, 1)) {
ProtoField f = checkProtoField(L,6);
hf_register_info hfri = { NULL, { NULL, NULL, 0, 0, NULL, 0, NULL, HFILL } };
hf_register_info hfri = { NULL, { NULL, NULL, FT_NONE, 0, NULL, 0, NULL, HFILL } };
gint* ettp = &(f->ett);
hfri.p_id = &(f->hfid);