diff options
| author | Evan Huus <eapache@gmail.com> | 2014-02-27 16:59:08 -0500 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-02-27 22:00:49 +0000 |
| commit | 54cccefef604dd5a128512fa4c9d04cf8b25d55b (patch) | |
| tree | b4194a61cd33f6ee4c4fdafda48d1487856147a9 /epan | |
| parent | 655f2e4dd4c520ff40427af85034860d13103e58 (diff) | |
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>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/wslua/wslua.h | 24 | ||||
| -rw-r--r-- | epan/wslua/wslua_proto.c | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/epan/wslua/wslua.h b/epan/wslua/wslua.h index 8746b93791..34f05fcbce 100644 --- a/epan/wslua/wslua.h +++ b/epan/wslua/wslua.h @@ -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 { diff --git a/epan/wslua/wslua_proto.c b/epan/wslua/wslua_proto.c index 6b803b9f68..13aa1d9785 100644 --- a/epan/wslua/wslua_proto.c +++ b/epan/wslua/wslua_proto.c @@ -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); |